diff options
| author | teor <teor@torproject.org> | 2019-06-11 14:51:37 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-11 14:51:37 +1000 |
| commit | a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b (patch) | |
| tree | 485b39e4e29e9b038fa32b7507d4bc8c00a9c75d /src/test/test_rebind.py | |
| parent | 202ccc3930be8d93424303cc13a5c80c58c07817 (diff) | |
| parent | be0a4be276c945e4e90b43ce8f784b5b75bef122 (diff) | |
| download | tor-a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b.tar.gz tor-a742a80eeaf12e238c5b2e9eb06d8edbc8797c2b.zip | |
Merge remote-tracking branch 'tor-github/pr/1091' into maint-0.3.5
Diffstat (limited to 'src/test/test_rebind.py')
| -rw-r--r-- | src/test/test_rebind.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/test/test_rebind.py b/src/test/test_rebind.py index a376e62cb4..45ad1c5469 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) if socks_socket.connect_ex(('127.0.0.1', socks_port)): @@ -65,6 +69,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() |