diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-13 14:12:23 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-06-13 14:12:23 +0000 |
| commit | e504a81ff11c8611f06d54a23b355fed90b356ab (patch) | |
| tree | 221d8c95b7e97c29c3b8aa9933a4bc94d7807715 /test | |
| parent | 9778737d7b2a870ff195f318cceb48b93e661f03 (diff) | |
* test/socket/test_unix.rb: don't use Thread.abort_on_exception.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/socket/test_unix.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index d5bb30befb..b4c4592537 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -108,8 +108,6 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase r1, w = IO.pipe s1, s2 = UNIXSocket.pair s1.nonblock = s2.nonblock = true - aoe = Thread.abort_on_exception - Thread.abort_on_exception = true lock = Mutex.new nr = 0 x = 2 @@ -125,13 +123,13 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase s2.recv_io.close lock.synchronize { nr += 1 } end + true end end (x * y).times { s1.send_io r1 } - thrs.each { |t| t.join } + assert_equal([true]*x, thrs.map { |t| t.value }) assert_equal x * y, nr ensure - Thread.abort_on_exception = aoe s1.close s2.close w.close |