summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-02-20 09:14:40 -0500
committerNick Mathewson <nickm@torproject.org>2020-02-20 09:14:40 -0500
commit626eb025b6d1c348fdb4b9979c371413a2e14f02 (patch)
treeab68e3743358e9893a3e0e3d3f0e4b4c22f20713
parent09fb7987c5bfa248efba2961afe5eb5c8f5a6e9c (diff)
parentd71090f8e3769ff196ff36ffeabacef33bab3671 (diff)
downloadtor-626eb025b6d1c348fdb4b9979c371413a2e14f02.tar.gz
tor-626eb025b6d1c348fdb4b9979c371413a2e14f02.zip
Merge remote-tracking branch 'tor-github/pr/1745/head'
-rw-r--r--.travis.yml2
-rw-r--r--changes/ticket327923
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index c6468f78f7..16d2e432df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -262,7 +262,7 @@ 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 [[ "$CHUTNEY" != "" ]]; then "$CHUTNEY_PATH/tools/diagnostics.sh" || echo "diagnostics failed"; ls test_network_log || echo "ls failed"; cat test_network_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
diff --git a/changes/ticket32792 b/changes/ticket32792
new file mode 100644
index 0000000000..553cf0ca81
--- /dev/null
+++ b/changes/ticket32792
@@ -0,0 +1,3 @@
+ o Testing:
+ - When a Travis chutney job fails, use chutney's new "diagnostics.sh" tool
+ to produce detailed diagnostic output. Closes ticket 32792.