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

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit e83eabc9bfb6c07f80611beb6b02d43102806a0e Merge: 1bc2ae7be 5fda19030 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:17:46 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5 Merge changed chutney and stem script lines from 29280 with changed stem script lines from 30591. .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --cc .travis.yml index 66d39f69c,549098439..428c6a000 --- a/.travis.yml +++ b/.travis.yml @@@ -206,11 -209,11 +206,12 @@@ script - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi + - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi + - if [[ "$CHUTNEY" != "" ]]; then make test-network-all; fi - ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --log notice --target RUN_ALL; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes + ## Travis will kill the job after 10 minutes with no output + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE --log-file stem.log; fi - - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi @@@ -223,8 -226,8 +224,9 @@@ after_failure ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi - - if [[ "$TEST_STEM" != "" ]]; then cat "$STEM_SOURCE_DIR"/test/data/tor_log || echo "cat failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi before_cache: ## Delete all gcov files.

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 6d0883e9e932a9557a2c2ed0c358a6bf91b99c4e Merge: 21531f35f e27a74b1b Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:11:35 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 0a661cde1d553116937ff4ea9ac09dbc631d7432 Merge: e27a74b1b e83eabc9b Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:19:38 2019 +1000 Merge branch 'maint-0.3.5' into maint-0.4.0 .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 40d7f1e3a67c7777f44e50e009c313baf686e6b2 Merge: 6d0883e9e 0a661cde1 Author: teor <teor(a)torproject.org> Date: Thu Aug 8 11:19:58 2019 +1000 Merge branch 'maint-0.4.0' into maint-0.4.1 .travis.yml | 8 +++++--- changes/ticket30591 | 3 +++ changes/ticket30694 | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-)

1 0

[tor/maint-0.4.0] Travis: control "make check" with its own flag
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit b0826346a64e58b81e00ec6fcb0d2b75b302c0d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 27 07:51:52 2019 -0500 Travis: control "make check" with its own flag Previously we had "make check" launched whenever DISTCHECK was false. Now we'd like to turn it off in a few other circumstances, like running chutney. Maybe stem too? --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 456b5abc5..a6727923d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ matrix: ## We run coverage with hardening off, which seems like enough # - env: HARDENING_OPTIONS="" ## We check asciidoc with distcheck, to make sure we remove doc products - - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" + - env: DISTCHECK="yes" ASCIIDOC_OPTIONS="" SKIP_MAKE_CHECK="yes" ## Uncomment to allow the build to report success (with non-required ## sub-builds continuing to run) if all required sub-builds have @@ -153,7 +153,7 @@ script: - echo "Configure flags are $CONFIGURE_FLAGS" - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - - if [[ "$DISTCHECK" == "" ]]; then make check; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then make check; fi - if [[ "$DISTCHECK" != "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi @@ -163,7 +163,7 @@ after_failure: ## But the log is too long for travis' rendered view, so tail it. - tail -1000 config.log || echo "tail failed" ## `make check` will leave a log file with more details of test failures. - - if [[ "$DISTCHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi + - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi

1 0

[tor/maint-0.4.0] Travis: only run the stem tests that use a tor binary
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit cdda69ca8ac611802ef2dcf6e5cf60977ab49209 Author: teor <teor(a)torproject.org> Date: Thu May 30 20:05:03 2019 +1000 Travis: only run the stem tests that use a tor binary Closes ticket 30694. --- .travis.yml | 2 +- changes/ticket30694 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1d6c838bf..01f155af2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -211,7 +211,7 @@ script: ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --log TRACE --target RUN_ALL; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi diff --git a/changes/ticket30694 b/changes/ticket30694 new file mode 100644 index 000000000..70dbf6481 --- /dev/null +++ b/changes/ticket30694 @@ -0,0 +1,3 @@ + o Testing (continuous integration): + - In Travis, only run the stem tests that use a tor binary. + Closes ticket 30694.

1 0

[tor/maint-0.4.0] Travis: show the chutney commit and python version
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit ac7ce179834d8d97342fc17bc385730eccc109a8 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:10:07 2019 +1000 Travis: show the chutney commit and python version Part of 29280. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index cb1351a18..562036e51 100644 --- a/.travis.yml +++ b/.travis.yml @@ -151,6 +151,10 @@ install: ## Finally, list installed package versions - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then dpkg-query --show; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi + ## Get python version + - python --version + ## If we're running chutney, show the chutney commit + - if [[ "$CHUTNEY" != "" ]]; then pushd "$CHUTNEY_PATH"; git log -1 ; popd ; fi script: - ./autogen.sh

1 0

[tor/maint-0.4.0] Travis: Log stem's TRACE logs to a file, and tail it on failure
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 5fda19030930d0609734191911f971e23aa5359c Author: teor <teor(a)torproject.org> Date: Mon Jul 1 13:01:52 2019 +1000 Travis: Log stem's TRACE logs to a file, and tail it on failure Also filter out stem's SocketClosed logs, and fix some nearby comments. Part of 30591. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5ef6dba2..549098439 100644 --- a/.travis.yml +++ b/.travis.yml @@ -212,7 +212,7 @@ script: - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes ## Travis will kill the job after 10 minutes with no output - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE | grep -v SocketClosed; fi + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE --log-file stem.log; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi @@ -227,6 +227,7 @@ after_failure: - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-core || echo "make failed"; fi - if [[ "$TEST_STEM" != "" ]]; then tail -1000 "$STEM_SOURCE_DIR"/test/data/tor_log || echo "tail failed"; fi + - if [[ "$TEST_STEM" != "" ]]; then grep -v "SocketClosed" stem.log | tail -1000 || echo "grep | tail failed"; fi before_cache: ## Delete all gcov files.

1 0

[tor/maint-0.4.0] Travis: show chutney logs on chutney job failure
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit b26e3e4c565f4f764ee13a8afd5ea569547bc402 Author: teor <teor(a)torproject.org> Date: Mon Jul 1 14:05:26 2019 +1000 Travis: show chutney logs on chutney job failure Part of 29280. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index a8ad1f122..cb1351a18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -172,6 +172,7 @@ after_failure: - if [[ "$SKIP_MAKE_CHECK" == "" ]]; then cat test-suite.log || echo "cat failed"; fi ## `make distcheck` puts it somewhere different. - if [[ "$DISTCHECK" != "" ]]; then make show-distdir-testlog || echo "make failed"; fi + - if [[ "$CHUTNEY" != "" ]]; then ls test_network_log || echo "ls failed"; cat test_network_log/* || echo "cat failed"; fi before_cache: ## Delete all gcov files.

1 0

[tor/maint-0.4.0] Travis: Don't log stem's SocketClosed TRACE logs to the console
by teor＠torproject.org 08 Aug '19

08 Aug '19

commit 1cad1f98045260c384c27afb7375ada2b00b4cb9 Author: teor <teor(a)torproject.org> Date: Fri Jun 14 12:13:28 2019 +1000 Travis: Don't log stem's SocketClosed TRACE logs to the console And fix some nearby comments. Part of 30591. --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01f155af2..d5ef6dba2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -210,8 +210,9 @@ script: - ./configure $CONFIGURE_FLAGS ## We run `make check` because that's what https://jenkins.torproject.org does. - if [[ "$DISTCHECK" == "" && "$TEST_STEM" == "" ]]; then make check; fi - ## Diagnostic for bug 29437: kill stem if it hangs for 15 minutes - - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE; fi + ## Diagnostic for bug 29437: kill stem if it hangs for 9.5 minutes + ## Travis will kill the job after 10 minutes with no output + - if [[ "$TEST_STEM" != "" ]]; then make src/app/tor; timelimit -p -t 540 -s USR1 -T 30 -S ABRT python3 "$STEM_SOURCE_DIR"/run_tests.py --tor src/app/tor --integ --test control.controller --test control.base_controller --test process --log TRACE | grep -v SocketClosed; fi - if [[ "$DISTCHECK" != "" && "$TEST_STEM" == "" ]]; then make distcheck DISTCHECK_CONFIGURE_FLAGS="$CONFIGURE_FLAGS"; fi ## If this build was one that produced coverage, upload it. - if [[ "$COVERAGE_OPTIONS" != "" ]]; then coveralls -b . --exclude src/test --exclude src/trunnel --gcov-options '\-p' || echo "Coverage failed"; fi

1 0