[tor-commits] [tor/release-0.3.5] Use empty torrc file when launching tor in test_rebind.py

[teor at torproject.org]

commit 93dcfc659300f9ad5277ec531612013e4b8a13d3
Author: rl1987 <rl1987 at sdf.lonestar.org>
Date:   Wed Mar 13 17:53:51 2019 +0200

    Use empty torrc file when launching tor in test_rebind.py
---
 src/test/test_rebind.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 00e5a08be..4c41e1f43 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -82,13 +82,17 @@ if not os.path.exists(sys.argv[2]):
 tor_path = sys.argv[1]
 data_dir = sys.argv[2]
 
+empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
+open(empty_torrc_path, 'w').close()
+
 tor_process = subprocess.Popen([tor_path,
                                '-DataDirectory', data_dir,
                                '-ControlPort', '127.0.0.1:{}'.format(control_port),
                                '-SOCKSPort', '127.0.0.1:{}'.format(socks_port),
                                '-Log', 'debug stdout',
                                '-LogTimeGranularity', '1',
-                               '-FetchServerDescriptors', '0'],
+                               '-FetchServerDescriptors', '0',
+                               '-f', empty_torrc_path],
                                stdout=subprocess.PIPE,
                                stderr=subprocess.PIPE)