diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-05-29 21:19:56 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-05-29 21:19:56 +0300 |
| commit | 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d (patch) | |
| tree | 6bd74ee8252c7f47f147ebdfdda97499b10ae384 /src/test/test_rebind.py | |
| parent | c7f9f7e5426b473a505063904116760c7fae7e11 (diff) | |
| parent | 12b9bfc05f3a163b44f0f8b6638f027de16e622b (diff) | |
| download | tor-00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d.tar.gz tor-00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d.zip | |
Merge branch 'tor-github/pr/924' into maint-0.4.0
Diffstat (limited to 'src/test/test_rebind.py')
| -rw-r--r-- | src/test/test_rebind.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 65feedd243..7b12626a91 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -83,13 +83,21 @@ 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() +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, '-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, + '--defaults-torrc', empty_defaults_torrc_path, + ], stdout=subprocess.PIPE, stderr=subprocess.PIPE) |