diff options
| author | teor <teor@torproject.org> | 2019-06-10 20:50:53 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-10 20:50:53 +1000 |
| commit | 430dd2da6e97c7186b03caabbbac95d74c3d8b82 (patch) | |
| tree | 1b1dc94b59ca3291f301401e67167f07eef745a3 /src | |
| parent | 6a6f7eb6718f22da80596a35e7774b075a417e97 (diff) | |
| parent | be0a4be276c945e4e90b43ce8f784b5b75bef122 (diff) | |
| download | tor-430dd2da6e97c7186b03caabbbac95d74c3d8b82.tar.gz tor-430dd2da6e97c7186b03caabbbac95d74c3d8b82.zip | |
Merge branch 'bug30713_035' into bug30713_040
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/test_rebind.py | 7 | ||||
| -rwxr-xr-x | src/test/test_rebind.sh | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index 7b12626a91..232b200326 100644 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@ -16,6 +16,10 @@ def fail(msg): logging.error('FAIL') sys.exit(msg) +def skip(msg): + logging.warning('SKIP: {}'.format(msg)) + sys.exit(77) + def try_connecting_to_socksport(): socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) e = socks_socket.connect_ex(('127.0.0.1', socks_port)) @@ -66,6 +70,9 @@ if sys.hexversion < 0x02070000: if sys.hexversion > 0x03000000 and sys.hexversion < 0x03010000: fail("ERROR: unsupported Python3 version (should be >= 3.1)") +if 'TOR_SKIP_TEST_REBIND' in os.environ: + skip('$TOR_SKIP_TEST_REBIND is set') + control_port = pick_random_port() socks_port = pick_random_port() diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 498072de35..ea2012957e 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -27,6 +27,6 @@ elif [ ! -d "$tmpdir" ]; then exit 3 fi -"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir" || exitcode=1 +"${PYTHON:-python}" "${abs_top_srcdir:-.}/src/test/test_rebind.py" "${TESTING_TOR_BINARY}" "$tmpdir" -exit ${exitcode} +exit $? |