diff options
| author | teor <teor@torproject.org> | 2019-06-10 18:59:02 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-10 20:49:59 +1000 |
| commit | be0a4be276c945e4e90b43ce8f784b5b75bef122 (patch) | |
| tree | 72ccc9e3e2f092b0a87e416c5adf07bfe6763f2b /src/test/test_rebind.py | |
| parent | e5deb2bbc73d8830ae6c479a4532e72112f5484a (diff) | |
| download | tor-be0a4be276c945e4e90b43ce8f784b5b75bef122.tar.gz tor-be0a4be276c945e4e90b43ce8f784b5b75bef122.zip | |
Travis: Skip test_rebind on macOS builds
Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable
is set.
Skip test_rebind on macOS in Travis builds, because it is unreliable
on macOS on Travis.
Fixes bug 30713; bugfix on 0.3.5.1-alpha.
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 00e5a08be7..77829ca920 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() |