diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-26 14:15:39 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-26 14:15:39 +0000 |
| commit | cc4a5a6bdee491c5439f07d95234668dbb956e72 (patch) | |
| tree | ce44ae2d1b16ff12f219ade35e548432919ce328 /test/socket | |
| parent | 19d0242ed7171e1701fbc1653c684ca50fe2881f (diff) | |
| download | ruby-cc4a5a6bdee491c5439f07d95234668dbb956e72.tar.gz ruby-cc4a5a6bdee491c5439f07d95234668dbb956e72.tar.xz ruby-cc4a5a6bdee491c5439f07d95234668dbb956e72.zip | |
* ext/socket/lib/socket.rb (BasicSocket#connect_address): new method.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22649 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/socket')
| -rw-r--r-- | test/socket/test_socket.rb | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index c4d14e7f3..dc7a6e112 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -73,22 +73,9 @@ class TestSocket < Test::Unit::TestCase } end - def tcp_unspecified_to_loopback(addrinfo) - if addrinfo.ipv4? && addrinfo.ip_address == "0.0.0.0" - Addrinfo.tcp("127.0.0.1", addrinfo.ip_port) - elsif addrinfo.ipv6? && addrinfo.ipv6_unspecified? - Addrinfo.tcp("::1", addrinfo.ip_port) - elsif addrinfo.ipv6? && (ai = addrinfo.ipv6_to_ipv4) && ai.ip_address == "0.0.0.0" - Addrinfo.tcp("127.0.0.1", addrinfo.ip_port) - else - addrinfo - end - end - def test_tcp TCPServer.open(0) {|serv| - addr = serv.local_address - addr = tcp_unspecified_to_loopback(addr) + addr = serv.connect_address addr.connect {|s1| s2 = serv.accept begin @@ -185,7 +172,7 @@ class TestSocket < Test::Unit::TestCase tcp_servers = Socket.tcp_server_sockets(0) unix_server = Socket.unix_server_socket("#{tmpdir}/sock") tcp_servers.each {|s| - addr = tcp_unspecified_to_loopback(s.local_address) + addr = s.connect_address clients << addr.connect } clients << unix_server.local_address.connect |