nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.0' into maint-0.4.1

Browse Source
This commit is contained in:
Nick Mathewson 2019-06-10 18:33:26 -04:00
commit 6a72cc2598
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -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 - if [[ "$TEST_STEM" != "" ]]; then pushd stem; python -c "from stem import stem; print(stem.__version__);"; git log -1; popd; fi
script: script:
# Skip test_rebind on macOS
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export TOR_SKIP_TEST_REBIND=true; fi
- ./autogen.sh - ./autogen.sh
- CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS $MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS --enable-fatal-warnings --disable-silent-rules" - 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" - echo "Configure flags are $CONFIGURE_FLAGS"

5
changes/bug30713 Normal file
View File

@ -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.

7
src/test/test_rebind.py
View File

@ -16,6 +16,10 @@ def fail(msg):
logging.error('FAIL') logging.error('FAIL')
sys.exit(msg) sys.exit(msg)
def skip(msg):
logging.warning('SKIP: {}'.format(msg))
sys.exit(77)
def try_connecting_to_socksport(): def try_connecting_to_socksport():
socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) socks_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
e = socks_socket.connect_ex(('127.0.0.1', socks_port)) 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: if sys.hexversion > 0x03000000 and sys.hexversion < 0x03010000:
fail("ERROR: unsupported Python3 version (should be >= 3.1)") 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() control_port = pick_random_port()
socks_port = pick_random_port() socks_port = pick_random_port()

4
src/test/test_rebind.sh
View File

@ -32,6 +32,6 @@ elif [ ! -d "$tmpdir" ]; then
exit 3 exit 3
fi 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 $?