June 2019 - tor-commits - lists.torproject.org

[tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit c8447f95ec202bff9d99941dcdf0dca91e0edc3f Merge: 430dd2da6 d761c3ca6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:44:20 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1094' into maint-0.4.0 .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --cc .travis.yml index 30e6d9a6b,a1a48baff..7d8877c2a --- a/.travis.yml +++ b/.travis.yml @@@ -70,7 -70,17 +70,11 @@@ matrix ## Careful! We use global envs, which makes it hard to exclude or ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… + allow_failures: + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" + exclude: - ## Clang doesn't work in containerized builds, see below. - - compiler: clang - sudo: false - ## Non-containerized gcc are slow and redundant. - - compiler: gcc - sudo: required ## gcc on OSX is less useful, because the default compiler is clang. - compiler: gcc os: osx

1 0

[tor/maint-0.4.1] Travis: allow the test-stem job to fail
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..a1a48baff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,10 @@ matrix: ## Careful! We use global envs, which makes it hard to exclude or ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… + allow_failures: + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" + exclude: ## Clang doesn't work in containerized builds, see below. - compiler: clang diff --git a/changes/bug30744 b/changes/bug30744 new file mode 100644 index 000000000..9f07d4855 --- /dev/null +++ b/changes/bug30744 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes hangs. + Fixes bug 30744; bugfix on 0.3.5.4-alpha.

1 0

[tor/maint-0.4.0] Travis: allow the test-stem job to fail
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit d761c3ca6de62ecdced9933a0717bf3ee598b073 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 19:18:35 2019 +1000 Travis: allow the test-stem job to fail Allow the test-stem job to fail in Travis, because it sometimes hangs. Fixes bug 30744; bugfix on 0.3.5.4-alpha. --- .travis.yml | 4 ++++ changes/bug30744 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 89040d822..a1a48baff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,6 +70,10 @@ matrix: ## Careful! We use global envs, which makes it hard to exclude or ## allow failures by env: ## https://docs.travis-ci.com/user/customizing-the-build#matching-jobs-with-al… + allow_failures: + ## test-stem sometimes hangs on Travis + - env: TEST_STEM="yes" + exclude: ## Clang doesn't work in containerized builds, see below. - compiler: clang diff --git a/changes/bug30744 b/changes/bug30744 new file mode 100644 index 000000000..9f07d4855 --- /dev/null +++ b/changes/bug30744 @@ -0,0 +1,3 @@ + o Minor bugfixes (continuous integration): + - Allow the test-stem job to fail in Travis, because it sometimes hangs. + Fixes bug 30744; bugfix on 0.3.5.4-alpha.

1 0

[tor/release-0.4.0] Travis: Skip test_rebind on macOS builds
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 18:59:02 2019 +1000 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. --- .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89040d822..3a9715b25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,6 +204,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 000000000..e00b98da6 --- /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 00e5a08be..77829ca92 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() diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 498072de3..ea2012957 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 $?

1 0

[tor/release-0.4.1] Travis: Skip test_rebind on macOS builds
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 18:59:02 2019 +1000 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. --- .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89040d822..3a9715b25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,6 +204,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 000000000..e00b98da6 --- /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 00e5a08be..77829ca92 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() diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 498072de3..ea2012957 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 $?

1 0

[tor/release-0.4.1] Merge branch 'bug30713_035' into bug30713_040
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit 430dd2da6e97c7186b03caabbbac95d74c3d8b82 Merge: 6a6f7eb67 be0a4be27 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 20:50:53 2019 +1000 Merge branch 'bug30713_035' into bug30713_040 .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --cc src/test/test_rebind.py index 7b12626a9,77829ca92..232b20032 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@@ -16,12 -16,15 +16,16 @@@ 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)): + e = socks_socket.connect_ex(('127.0.0.1', socks_port)) + if e: tor_process.terminate() - fail('Cannot connect to SOCKSPort') + fail('Cannot connect to SOCKSPort: error ' + os.strerror(e)) socks_socket.close() def wait_for_log(s):

1 0

[tor/release-0.4.0] Merge branch 'bug30713_035' into bug30713_040
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit 430dd2da6e97c7186b03caabbbac95d74c3d8b82 Merge: 6a6f7eb67 be0a4be27 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 20:50:53 2019 +1000 Merge branch 'bug30713_035' into bug30713_040 .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --cc src/test/test_rebind.py index 7b12626a9,77829ca92..232b20032 --- a/src/test/test_rebind.py +++ b/src/test/test_rebind.py @@@ -16,12 -16,15 +16,16 @@@ 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)): + e = socks_socket.connect_ex(('127.0.0.1', socks_port)) + if e: tor_process.terminate() - fail('Cannot connect to SOCKSPort') + fail('Cannot connect to SOCKSPort: error ' + os.strerror(e)) socks_socket.close() def wait_for_log(s):

1 0

[tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit 0fe3b373acfff401059bcbf13ed1503aa19d0c69 Merge: 463ded569 430dd2da6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:33:26 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit 6a72cc25983850fb23bd21adb181b38c0ead2c5a Merge: c0285320d 430dd2da6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 18:33:26 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.0] Travis: Skip test_rebind on macOS builds
by nickm＠torproject.org 11 Jun '19

11 Jun '19

commit be0a4be276c945e4e90b43ce8f784b5b75bef122 Author: teor <teor(a)torproject.org> Date: Mon Jun 10 18:59:02 2019 +1000 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. --- .travis.yml | 2 ++ changes/bug30713 | 5 +++++ src/test/test_rebind.py | 7 +++++++ src/test/test_rebind.sh | 4 ++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 89040d822..3a9715b25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -204,6 +204,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 000000000..e00b98da6 --- /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 00e5a08be..77829ca92 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() diff --git a/src/test/test_rebind.sh b/src/test/test_rebind.sh index 498072de3..ea2012957 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 $?

1 0