test/graceful_quit: fix and speed up test under GNU/kFreeBSD

No need to repeatedly yield (due to small skbs) because
we already checked for graceful shutdown.

1 files changed, 6 insertions, 5 deletions

diff --git a/test/graceful_quit.rb b/test/graceful_quit.rb
index 42a92d5..72f8db7 100644
--- a/test/graceful_quit.rb
+++ b/test/graceful_quit.rb
@@ -85,16 +85,18 @@ class TestGracefulQuit < Test::Unit::TestCase
       assert_match(expect, ps_output)
     end
 
+                errs = [ Errno::ECONNREFUSED ]
+    errs << Errno::EINVAL if RUBY_PLATFORM =~ /freebsd/
     t_yield
-    assert_raises(Errno::ECONNREFUSED, "http acceptor should shut down") do
+    assert_raises(*(errs + [ "http acceptor should shut down" ])) do
       100.times do
-        TCPSocket.new(@host, @http)
+        TCPSocket.new(@host, @http).close
         t_yield
       end
     end
-    assert_raises(Errno::ECONNREFUSED, "mgmt acceptor should shut down") do
+    assert_raises(*(errs + [ "mgmt acceptor should shut down" ])) do
       100.times do
-        TCPSocket.new(@host, @mgmt)
+        TCPSocket.new(@host, @mgmt).close
         t_yield
       end
     end
@@ -102,7 +104,6 @@ class TestGracefulQuit < Test::Unit::TestCase
     bytes = 0
     buf = ""
     begin
-      t_yield
       client.readpartial(666666, buf)
       bytes += buf.size
     rescue EOFError