commit af9dc12fabb664ea100ae12f9c9493ed403cb5c2
Merge: cf3f7753c 11a91ef72
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Sat Dec 1 11:20:10 2018 -0500
Merge branch 'maint-0.3.5'
changes/ticket28229_diag | 3 +++
src/test/test_rebind.py | 16 ++++++++++++----
2 files changed, 15 insertions(+), 4 deletions(-)
diff --cc src/test/test_rebind.py
index 2f366b271,2215b4225..6f759b717
--- a/src/test/test_rebind.py
+++ b/src/test/test_rebind.py
@@@ -67,21 -73,16 +73,23 @@@ socks_port = pick_random_port(
assert control_port != 0
assert socks_port != 0
+if len(sys.argv) < 3:
+ fail('Usage: %s <path-to-tor> <data-dir>' % sys.argv[0])
+
if not os.path.exists(sys.argv[1]):
fail('ERROR: cannot find tor at %s' % sys.argv[1])
+if not os.path.exists(sys.argv[2]):
+ fail('ERROR: cannot find datadir at %s' % sys.argv[2])
tor_path = sys.argv[1]
+data_dir = sys.argv[2]
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'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)