diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-06 05:50:42 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-04-06 05:50:42 +0000 |
| commit | cb302bf35109d69063ac589dd75f6356257a7fda (patch) | |
| tree | 81429547230c946933771a24a4b98e7a6dd9e3aa /test/socket | |
| parent | b1fd376cbfbccc523921a950b1bc6bcaa01c0f99 (diff) | |
* ext/socket/rubysocket.h (SockAddrStringValueWithAddrinfo): New macro.
(rsock_sockaddr_string_value_with_addrinfo): New declaration.
(rsock_addrinfo_inspect_sockaddr): Ditto.
(rsock_sys_fail_addrinfo): Ditto.
(rsock_sys_fail_sockaddr_or_addrinfo): Ditto.
* ext/socket/raddrinfo.c (rsock_addrinfo_inspect_sockaddr): Renamed
from addrinfo_inspect_sockaddr and exported.
(rsock_sockaddr_string_value_with_addrinfo): New function to obtain
string and possibly addrinfo object.
* ext/socket/socket.c (rsock_sys_fail_sockaddr): Don't use
rsock_sys_fail_host_port which is IP dependent. Invoke
rsock_sys_fail_addrinfo.
(rsock_sys_fail_addrinfo): New function using
rsock_addrinfo_inspect_sockaddr.
(rsock_sys_fail_addrinfo_or_sockaddr): New function.
(sock_connect): Use SockAddrStringValueWithAddrinfo and
rsock_sys_fail_addrinfo_or_sockaddr.
(sock_connect_nonblock): Ditto.
(sock_bind): Ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/socket')
| -rw-r--r-- | test/socket/test_socket.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 61cb3bb066..be6dabf3d7 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -81,7 +81,7 @@ class TestSocket < Test::Unit::TestCase s.bind(Socket.sockaddr_in(port, "127.0.0.1")) end - assert_match "bind(2) for \"127.0.0.1\" port #{port}", e.message + assert_match "bind(2) for 127.0.0.1:#{port}", e.message } } end |