nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/539'

Browse Source
This commit is contained in:
Nick Mathewson 2018-11-26 17:22:37 -05:00
commit c292e505ff
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/test/test_rebind.py
View File

@ -67,12 +67,19 @@ socks_port = pick_random_port()
assert control_port != 0 assert control_port != 0
assert socks_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]): if not os.path.exists(sys.argv[1]):
fail('ERROR: cannot find tor at %s' % 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] tor_path = sys.argv[1]
data_dir = sys.argv[2]
tor_process = subprocess.Popen([tor_path, tor_process = subprocess.Popen([tor_path,
'-DataDirectory', data_dir,
'-ControlPort', '127.0.0.1:{}'.format(control_port), '-ControlPort', '127.0.0.1:{}'.format(control_port),
'-SOCKSPort', '127.0.0.1:{}'.format(socks_port), '-SOCKSPort', '127.0.0.1:{}'.format(socks_port),
'-FetchServerDescriptors', '0'], '-FetchServerDescriptors', '0'],
@ -82,9 +89,6 @@ tor_process = subprocess.Popen([tor_path,
if tor_process == None: if tor_process == None:
fail('ERROR: running tor failed') fail('ERROR: running tor failed')
if len(sys.argv) < 2:
fail('Usage: %s <path-to-tor>' % sys.argv[0])
wait_for_log('Opened Control listener on') wait_for_log('Opened Control listener on')
try_connecting_to_socksport() try_connecting_to_socksport()

15
src/test/test_rebind.sh
View File

@ -14,6 +14,19 @@ fi
exitcode=0 exitcode=0
"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" || exitcode=1 tmpdir=
clean () { test -n "$tmpdir" && test -d "$tmpdir" && rm -rf "$tmpdir" || :; }
trap clean EXIT HUP INT TERM
tmpdir="`mktemp -d -t tor_rebind_test.XXXXXX`"
if [ -z "$tmpdir" ]; then
echo >&2 mktemp failed
exit 2
elif [ ! -d "$tmpdir" ]; then
echo >&2 mktemp failed to make a directory
exit 3
fi
"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir" || exitcode=1
exit ${exitcode} exit ${exitcode}