test: cleanup socket usage and lifetimes

This should help prevent us from running out of FDs prematurely
as our test suite becomes more multi-threaded.  We can also use
plain TCPSocket in tests where we inherit the file descriptor
from the parent (w/o accept).

1 files changed, 2 insertions, 1 deletions

diff --git a/test/server_helper.rb b/test/server_helper.rb
index 78d2f94..97a175a 100644
--- a/test/server_helper.rb
+++ b/test/server_helper.rb
@@ -11,7 +11,7 @@ module ServerHelper
     err.rewind
     lines = err.readlines.delete_if { |l| l =~ /INFO/ }
     assert lines.empty?, lines.join("\n")
-    err.close
+    err.close! if err == @err
   end
 
   def poke_until_dead(pid)
@@ -40,6 +40,7 @@ module ServerHelper
     raise
   end
 
+  # only use for newly bound sockets
   def get_tcp_client(host, port, tries = 500)
     begin
       c = TCPSocket.new(host, port)