1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.

Browse Source 
* test/socket/test_socket.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29996 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-12-01 12:42:50 +00:00
parent bb9464dea8
commit 6dea556eb7
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Dec 1 21:41:57 2010 Tanaka Akira <akr@fsij.org>
* test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.
* test/socket/test_socket.rb: ditto.
Wed Dec 1 15:08:32 2010 NAKAMURA Usaku <usa@ruby-lang.org> Wed Dec 1 15:08:32 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* test/openssl/test_ssl.rb (test_not_started_session): non socket * test/openssl/test_ssl.rb (test_not_started_session): non socket

14
test/socket/test_addrinfo.rb
View File

@ -330,6 +330,10 @@ class TestSocketAddrinfo < Test::Unit::TestCase
49152 + rand(65535-49152+1) 49152 + rand(65535-49152+1)
end end
def errors_addrinuse
[Errno::EADDRINUSE]
end
def test_connect_from def test_connect_from
TCPServer.open("0.0.0.0", 0) {|serv| TCPServer.open("0.0.0.0", 0) {|serv|
serv_ai = Addrinfo.new(serv.getsockname, :INET, :STREAM) serv_ai = Addrinfo.new(serv.getsockname, :INET, :STREAM)
@ -344,7 +348,7 @@ class TestSocketAddrinfo < Test::Unit::TestCase
s2.close s2.close
end end
} }
rescue Errno::EADDRINUSE rescue *errors_addrinuse
# not test failure # not test failure
end end
} }
@ -365,7 +369,7 @@ class TestSocketAddrinfo < Test::Unit::TestCase
s2.close s2.close
end end
} }
rescue Errno::EADDRINUSE rescue *errors_addrinuse
# not test failure # not test failure
end end
} }
@ -385,7 +389,7 @@ class TestSocketAddrinfo < Test::Unit::TestCase
s2.close s2.close
end end
} }
rescue Errno::EADDRINUSE rescue *errors_addrinuse
# not test failure # not test failure
end end
} }
@ -398,7 +402,7 @@ class TestSocketAddrinfo < Test::Unit::TestCase
client_ai.bind {|s| client_ai.bind {|s|
assert_equal(port, s.local_address.ip_port) assert_equal(port, s.local_address.ip_port)
} }
rescue Errno::EADDRINUSE rescue *errors_addrinuse
# not test failure # not test failure
end end
end end
@ -422,7 +426,7 @@ class TestSocketAddrinfo < Test::Unit::TestCase
end end
} }
} }
rescue Errno::EADDRINUSE rescue *errors_addrinuse
# not test failure # not test failure
end end
end end

6
test/socket/test_socket.rb
View File

@ -105,11 +105,15 @@ class TestSocket < Test::Unit::TestCase
49152 + rand(65535-49152+1) 49152 + rand(65535-49152+1)
end end
def errors_addrinuse
[Errno::EADDRINUSE]
end
def test_tcp_server_sockets def test_tcp_server_sockets
port = random_port port = random_port
begin begin
sockets = Socket.tcp_server_sockets(port) sockets = Socket.tcp_server_sockets(port)
rescue Errno::EADDRINUSE rescue *errors_addrinuse
return # not test failure return # not test failure
end end
begin begin