tests: do not lose exceptions on quit timeouts

We should see the reason for test failures.

7 files changed, 5 insertions, 24 deletions

diff --git a/test/server_helper.rb b/test/server_helper.rb
index 812e91b..89276b8 100644
--- a/test/server_helper.rb
+++ b/test/server_helper.rb
@@ -29,10 +29,15 @@ module ServerHelper
 
   def quit_wait(pid)
     pid or return
+    err = $!
     Process.kill(:QUIT, pid)
     _, status = Timeout.timeout(10) { Process.waitpid2(pid) }
     assert status.success?, status.inspect
   rescue Timeout::Error
+    begin
+      warn "#{err.message} (#{err.class})"
+      err.backtrace.each { |l| warn l }
+    end
     if RUBY_PLATFORM =~ /linux/
       system("lsof -p #{pid}")
       warn "#{pid} failed to die, waiting for user to inspect"
diff --git a/test/test_bin.rb b/test/test_bin.rb
index 074127c..71333e7 100644
--- a/test/test_bin.rb
+++ b/test/test_bin.rb
@@ -189,9 +189,6 @@ class TestBin < Testcase
     else
       poke_until_dead newpid
     end
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   ensure
     File.unlink(exe) if exe
     cfg.close! if cfg
diff --git a/test/test_client_expire.rb b/test/test_client_expire.rb
index 1c7b038..3a41c8e 100644
--- a/test/test_client_expire.rb
+++ b/test/test_client_expire.rb
@@ -75,9 +75,6 @@ class TestClientExpire < Testcase
       end
       io.close
     end
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   ensure
     quit_wait(pid)
   end
@@ -123,9 +120,6 @@ class TestClientExpire < Testcase
     File.truncate(err.path, 0) # avoid error on teardown
     re = %r{consider raising open file limits} # - accept, consider raising open file limits}
     assert_equal errs.grep(re), errs
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   ensure
     quit_wait(pid)
   end
diff --git a/test/test_output_buffering.rb b/test/test_output_buffering.rb
index 2f52870..dc91aed 100644
--- a/test/test_output_buffering.rb
+++ b/test/test_output_buffering.rb
@@ -106,9 +106,6 @@ class TestOutputBuffering < Testcase
     else
       raise "TESTBUG"
     end
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   ensure
     quit_wait(pid)
   end
diff --git a/test/test_reopen_logs.rb b/test/test_reopen_logs.rb
index cbe6a83..4ca6e66 100644
--- a/test/test_reopen_logs.rb
+++ b/test/test_reopen_logs.rb
@@ -55,9 +55,6 @@ class TestReopenLogs < Testcase
         end until File.read(opath) =~ /bbb/
       end
     end
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   ensure
     quit_wait(pid)
   end
diff --git a/test/test_serve_static.rb b/test/test_serve_static.rb
index 944a597..4b46fb0 100644
--- a/test/test_serve_static.rb
+++ b/test/test_serve_static.rb
@@ -33,9 +33,6 @@ class TestServeStatic < Testcase
       res = http.request(req)
       assert_equal gplv3[5..46], res.body
     end
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   ensure
     quit_wait(pid)
   end
diff --git a/test/test_server.rb b/test/test_server.rb
index 00e8a0a..6a3b1f1 100644
--- a/test/test_server.rb
+++ b/test/test_server.rb
@@ -60,9 +60,6 @@ class TestServer < Testcase
     _, status = Timeout.timeout(10) { Process.waitpid2(pid) }
     assert status.success?, status.inspect
     c.close
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   end
 
   def test_input_body_true; input_body(true); end
@@ -132,9 +129,6 @@ class TestServer < Testcase
     first = $1
     assert rv
     assert_equal first, buf
-  rescue => e
-    Yahns::Log.exception(Logger.new($stderr), "test", e)
-    raise
   ensure
     c.close if c
     quit_wait(pid)