diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-06-10 18:33:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-06-10 18:33:26 -0400 |
| commit | 6a72cc25983850fb23bd21adb181b38c0ead2c5a (patch) | |
| tree | 92c102567211f1f0f511612c67b7f59dd1db7525 | |
| parent | c0285320df4e52530129ca515de08245d035c889 (diff) | |
| parent | 430dd2da6e97c7186b03caabbbac95d74c3d8b82 (diff) | |
| download | tor-6a72cc25983850fb23bd21adb181b38c0ead2c5a.tar.gz tor-6a72cc25983850fb23bd21adb181b38c0ead2c5a.zip | |
Merge branch 'maint-0.4.0' into maint-0.4.1
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | changes/bug30713 | 5 | ||||
| -rw-r--r-- | src/test/test_rebind.py | 7 | ||||
| -rwxr-xr-x | src/test/test_rebind.sh | 4 |
4 files changed, 16 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 330388aa47..c2e6f19640 100644 --- a/.travis.yml +++ b/.travis.yml @@ -189,6 +189,8 @@ install: - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi script: + # Skip test_rebind on macOS + - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi - ./autogen.sh - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - echo "Configure flags are $CONFIGURE_FLAGS" diff --git a/changes/bug30713 b/changes/bug30713 new file mode 100644 index 0000000000..e00b98da65 --- /dev/null +++ b/changes/bug30713 @@ -0,0 +1,5 @@ + o Minor bugfixes (testing): + - Skip test_rebind when the TOR_SKIP_TEST_REBIND environmental variable is + set. Fixes bug 30713; bugfix on 0.3.5.1-alpha. + - Skip test_rebind on macOS in Travis, because it is unreliable on + macOS on Travis. Fixes bug 30713; bugfix on 0.3.5.1-alpha. 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 1d54dd7f33..e0d8394d38 100755 --- a/src/test/test_rebind.sh +++ b/src/test/test_rebind.sh @@ -32,6 +32,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 $? |