* test/socket/test_tcp.rb (TestTCPSocket#test_recvfrom): fix local

  variable conflict.  [ruby-dev:25083]


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

1 files changed, 4 insertions, 5 deletions

diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb
index 65100cf36..e05962198 100644
--- a/test/socket/test_tcp.rb
+++ b/test/socket/test_tcp.rb
@@ -9,19 +9,18 @@ class TestTCPSocket < Test::Unit::TestCase
   def test_recvfrom # [ruby-dev:24705]
     svr = TCPServer.new("localhost", 0)
     Thread.new {
-      s = svr.accept
-      s.print("x"*0x1000)
+      svr.accept.print("x"*0x1000)
     }
     addr = svr.addr
-    s = TCPSocket.open(addr[2], addr[1])
+    sock = TCPSocket.open(addr[2], addr[1])
     Thread.new {
       Thread.pass
       ObjectSpace.each_object(String) {|s|
         s.replace "a" if s.length == 0x10000
       }
     }
-    assert_raise(RuntimeError) {
-      open("/tmp/n", "w"){|f| f.puts(data = s.recvfrom(0x10000))}
+    assert_raise(RuntimeError, SocketError) {
+      sock.recvfrom(0x10000)
     }
   end
 end if defined?(TCPSocket)