tor

commit 626eb025b6d1c348fdb4b9979c371413a2e14f02
parent 09fb7987c5bfa248efba2961afe5eb5c8f5a6e9c
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 20 Feb 2020 09:14:40 -0500

Merge remote-tracking branch 'tor-github/pr/1745/head'

Diffstat:
M
.travis.yml
 | 
2
+-
A
changes/ticket32792
 | 
3
+++

2 files changed, 4 insertions(+), 1 deletion(-)
diff --git 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
@@ -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.