aboutsummaryrefslogtreecommitdiff
path: root/src/test/test_rebind.py
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-04-10 19:03:43 +1000
committerteor <teor@torproject.org>2019-04-10 19:03:43 +1000
commit12b9bfc05f3a163b44f0f8b6638f027de16e622b (patch)
treeceeaaefe130bdd5953eca62c441e8005effbd9c3 /src/test/test_rebind.py
parentacec0192c3d6400316037cdc3e4c9093c1919252 (diff)
downloadtor-12b9bfc05f3a163b44f0f8b6638f027de16e622b.tar.gz
tor-12b9bfc05f3a163b44f0f8b6638f027de16e622b.zip
test: Also avoid reading the system default torrc in integration tests
Part of 29702.
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 4c41e1f437..a376e62cb4 100644
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@ -84,6 +84,8 @@ data_dir = sys.argv[2]
empty_torrc_path = os.path.join(data_dir, 'empty_torrc')
open(empty_torrc_path, 'w').close()
+empty_defaults_torrc_path = os.path.join(data_dir, 'empty_defaults_torrc')
+open(empty_defaults_torrc_path, 'w').close()
tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
@@ -92,7 +94,9 @@ tor_process = subprocess.Popen([tor_path,
'-Log', 'debug stdout',
'-LogTimeGranularity', '1',
'-FetchServerDescriptors', '0',
- '-f', empty_torrc_path],
+ '-f', empty_torrc_path,
+ '--defaults-torrc', empty_defaults_torrc_path,
+ ],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)