From 39ad1419b8064e33ac6fa62bc4aed5bfcee1386a Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 29 Dec 2007 18:39:43 +0000
Subject: use timeout for thread join to avoid hang.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14786 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/io/nonblock/test_flush.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/io/nonblock/test_flush.rb b/test/io/nonblock/test_flush.rb
index 34450f6fb..249b2c913 100644
--- a/test/io/nonblock/test_flush.rb
+++ b/test/io/nonblock/test_flush.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'timeout'
 begin
   require 'io/nonblock'
 rescue LoadError
@@ -24,7 +25,9 @@ class TestIONonblock < Test::Unit::TestCase
       end
     }
     w.flush # assert_raise(IOError, "[ruby-dev:24985]") {w.flush}
-    assert_nothing_raised {t.join}
+    timeout(10) {
+      assert_nothing_raised {t.join}
+    }
     assert_equal(4097, result.size)
   end
 end if IO.method_defined?(:nonblock)
-- 
cgit