summaryrefslogtreecommitdiff
path: root/src/test/test_rebind.py
diff options
context:
space:
mode:
authorrl1987 <rl1987@sdf.lonestar.org>2019-03-13 17:53:51 +0200
committerteor <teor@torproject.org>2019-04-10 18:45:21 +1000
commit93dcfc659300f9ad5277ec531612013e4b8a13d3 (patch)
tree28d88a04fbeed1240ce09de1d5d26a4164d32fdf /src/test/test_rebind.py
parent3b9e3cca94dbeb083bfd64dfd4eb22a905cd2748 (diff)
downloadtor-93dcfc659300f9ad5277ec531612013e4b8a13d3.tar.gz
tor-93dcfc659300f9ad5277ec531612013e4b8a13d3.zip
Use empty torrc file when launching tor in test_rebind.py
Diffstat (limited to 'src/test/test_rebind.py')
-rw-r--r--src/test/test_rebind.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py
index 00e5a08be7..4c41e1f437 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)