diff options
| author | teor <teor@torproject.org> | 2019-08-08 11:19:58 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-08-08 11:19:58 +1000 |
| commit | 40d7f1e3a67c7777f44e50e009c313baf686e6b2 (patch) | |
| tree | 878602df7e4b4c2465b4545f7238a44b2ab264ab | |
| parent | 6d0883e9e932a9557a2c2ed0c358a6bf91b99c4e (diff) | |
| parent | 0a661cde1d553116937ff4ea9ac09dbc631d7432 (diff) | |
| download | tor-40d7f1e3a67c7777f44e50e009c313baf686e6b2.tar.gz tor-40d7f1e3a67c7777f44e50e009c313baf686e6b2.zip | |
Merge branch 'maint-0.4.0' into maint-0.4.1
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | changes/ticket30591 | 3 | ||||
| -rw-r--r-- | changes/ticket30694 | 3 |
3 files changed, 11 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 1049a3c54b..c2f1637e04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -211,8 +211,9 @@ script: - 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 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 @@ -226,7 +227,8 @@ 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 [[ "$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. diff --git a/changes/ticket30591 b/changes/ticket30591 new file mode 100644 index 0000000000..f97c024009 --- /dev/null +++ b/changes/ticket30591 @@ -0,0 +1,3 @@ + o Testing (continuous integration): + - In Travis, make stem log a controller trace to the console. And tail + stem's tor log after failure. Closes ticket 30591. diff --git a/changes/ticket30694 b/changes/ticket30694 new file mode 100644 index 0000000000..70dbf6481a --- /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. |