* test/socket/test_tcp.rb (TestTCPSocket#test_recvfrom): merged worker threads.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 9 deletions

diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb
index 8d55c011c..a1657f027 100644
--- a/test/socket/test_tcp.rb
+++ b/test/socket/test_tcp.rb
@@ -11,19 +11,13 @@ class TestTCPSocket < Test::Unit::TestCase
     svr = TCPServer.new("localhost", 0)
     Thread.new {
       c = svr.accept
-      Thread.pass until s
-      c.print("x"*0x1000)
-    }
-    addr = svr.addr
-    sock = TCPSocket.open(addr[2], addr[1])
-    Thread.new {
-      Thread.pass until c
-      Thread.critical = true
       ObjectSpace.each_object(String) {|s|
         s.replace "a" if s.length == 0x10000 and !s.frozen?
       }
-      Thread.critical = false
+      c.print("x"*0x1000)
     }
+    addr = svr.addr
+    sock = TCPSocket.open(addr[2], addr[1])
     assert_raise(RuntimeError, SocketError) {
       sock.recvfrom(0x10000)
     }