diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 05:19:26 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-04 05:19:26 +0000 |
| commit | 9093d9906edada210f62fe1b077bdc21623d57cd (patch) | |
| tree | f1d88c2bbb4d714124d783920b0180ec6de33aba /test | |
| parent | 7c47ca7e0339bbc0382ea3886feae4c425113d2f (diff) | |
merges r20442 from trunk into ruby_1_9_1.
* test/socket/test_tcp.rb (test_recvfrom): already can run on mswin32.
* test/socket/test_tcp.rb (test_recvfrom, test_encoding): use IP address instead
of host name.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
| -rw-r--r-- | test/socket/test_tcp.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb index cc744709a6..7404bc3700 100644 --- a/test/socket/test_tcp.rb +++ b/test/socket/test_tcp.rb @@ -7,7 +7,6 @@ end class TestTCPSocket < Test::Unit::TestCase def test_recvfrom -assert false, "TODO: doesn't work on mswin32/64" if /mswin/ =~ RUBY_PLATFORM svr = TCPServer.new("localhost", 0) th = Thread.new { c = svr.accept @@ -15,7 +14,7 @@ assert false, "TODO: doesn't work on mswin32/64" if /mswin/ =~ RUBY_PLATFORM c.close } addr = svr.addr - sock = TCPSocket.open(addr[2], addr[1]) + sock = TCPSocket.open(addr[3], addr[1]) assert_equal(["foo", nil], sock.recvfrom(0x10000)) ensure th.kill if th @@ -30,7 +29,7 @@ assert false, "TODO: doesn't work on mswin32/64" if /mswin/ =~ RUBY_PLATFORM c.close } addr = svr.addr - sock = TCPSocket.open(addr[2], addr[1]) + sock = TCPSocket.open(addr[3], addr[1]) assert_equal(true, sock.binmode?) s = sock.gets assert_equal("foo\r\n", s) |