about summary refs log tree commit homepage
path: root/test/server_helper.rb
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2013-10-23 00:25:32 +0000
committerEric Wong <e@80x24.org>2013-10-23 00:25:32 +0000
commita5fe8c725a54506c01d38578cd4f995329c58360 (patch)
tree825e4e7b795da887e09d07eb773c066c9c459761 /test/server_helper.rb
parent28163a34ceff8334b2af4c5c30ec1e642efb9be1 (diff)
downloadyahns-a5fe8c725a54506c01d38578cd4f995329c58360.tar.gz
Dump the backtrace for the timeout if we did not get anoher
exception
Diffstat (limited to 'test/server_helper.rb')
-rw-r--r--test/server_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/server_helper.rb b/test/server_helper.rb
index 71cb9d3..7a64618 100644
--- a/test/server_helper.rb
+++ b/test/server_helper.rb
@@ -33,7 +33,8 @@ module ServerHelper
     Process.kill(:QUIT, pid)
     _, status = Timeout.timeout(10) { Process.waitpid2(pid) }
     assert status.success?, status.inspect
-  rescue Timeout::Error
+  rescue Timeout::Error => tout
+    err ||= tout
     begin
       warn "#{err.message} (#{err.class})"
       err.backtrace.each { |l| warn l }