[PATCH 0/2] fix some test failures/warnings with newer Rubies

[PATCH 0/2] fix some test failures/warnings with newer Rubies

[Eric Wong]

Newer rubies are pickier...

Eric Wong (2):
  test_connect_fd_leak: do not close socket if non-existent
  test_syssend: avoid warning on cleanup

 test/test_connect_fd_leak.rb | 2 +-
 test/test_syssend.rb         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

[PATCH 1/2] test_connect_fd_leak: do not close socket if non-existent

[Eric Wong]

---
 test/test_connect_fd_leak.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test_connect_fd_leak.rb b/test/test_connect_fd_leak.rb
index 034fe5b..b1326f3 100644
--- a/test/test_connect_fd_leak.rb
+++ b/test/test_connect_fd_leak.rb
@@ -13,6 +13,6 @@ class TestConnectFDLeak < Test::Unit::TestCase
       sock = Kgio::UNIXSocket.new(path)
     rescue Errno::ENOENT
     end while (nr += 1) < 10000
-    sock.close
+    sock.close if sock
   end
 end

[PATCH 2/2] test_syssend: avoid warning on cleanup

[Eric Wong]

We don't want to clutter up logs with warnings for cross-thread
IO#close
---
 test/test_syssend.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/test_syssend.rb b/test/test_syssend.rb
index 7d2511a..a722462 100644
--- a/test/test_syssend.rb
+++ b/test/test_syssend.rb
@@ -37,6 +37,8 @@ class TestKgioSyssend < Test::Unit::TestCase
     # blocking
     th = Thread.new { loop { acc.kgio_syssend("ZZZZ", 0) } }
     assert_nil th.join(0.1)
+    th.kill
+    assert th.join(10), 'thread should be killed'
   ensure
     [ srv, acc, client ].each { |io| io.close if io }
   end