[tor-commits] [tor/release-0.3.5] Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5

[teor at torproject.org]

commit e83eabc9bfb6c07f80611beb6b02d43102806a0e
Merge: 1bc2ae7be 5fda19030
Author: teor <teor at 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.