diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-17 15:53:28 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-06-17 15:53:28 +0000 |
| commit | 29912d9ad952696293138e033e96847e0a3dd5c2 (patch) | |
| tree | 0b0f16e4e07a427af17418bc1f3607c84580d04a /test/socket/test_unix.rb | |
| parent | 6c992f1b26af9f55145f5ab62dc9f7e63dc983b9 (diff) | |
| download | ruby-29912d9ad952696293138e033e96847e0a3dd5c2.tar.gz ruby-29912d9ad952696293138e033e96847e0a3dd5c2.tar.xz ruby-29912d9ad952696293138e033e96847e0a3dd5c2.zip | |
* ext/socket/socket.c (bsock_recv_nonblock): new method
BasicSocket#recv_nonblock.
(udp_recvfrom_nonblock): renamed from ip_recvfrom_nonblock.
IPSocket#recvfrom_nonblock is moved to UDPSocket#recvfrom_nonblock.
(unix_recvfrom_nonblock): removed. UNIXSocket#is removed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@10305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/socket/test_unix.rb')
| -rw-r--r-- | test/socket/test_unix.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/socket/test_unix.rb b/test/socket/test_unix.rb index 80fc3b4f0..008a97023 100644 --- a/test/socket/test_unix.rb +++ b/test/socket/test_unix.rb @@ -101,11 +101,11 @@ class TestUNIXSocket < Test::Unit::TestCase s2.close end - def test_noname_recvfrom_nonblock + def test_noname_recv_nonblock s1, s2 = UNIXSocket.pair s2.write("a") IO.select [s1] - assert_equal(["a", ["AF_UNIX", ""]], s1.recvfrom_nonblock(10)) + assert_equal("a", s1.recv_nonblock(10)) ensure s1.close s2.close @@ -123,7 +123,7 @@ class TestUNIXSocket < Test::Unit::TestCase def test_dgram_pair s1, s2 = UNIXSocket.pair(Socket::SOCK_DGRAM) - assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) } + assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) } s2.send("", 0) s2.send("haha", 0) s2.send("", 0) @@ -132,7 +132,7 @@ class TestUNIXSocket < Test::Unit::TestCase assert_equal("haha", s1.recv(10)) assert_equal("", s1.recv(10)) assert_equal("", s1.recv(10)) - assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) } + assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) } ensure s1.close s2.close @@ -140,7 +140,7 @@ class TestUNIXSocket < Test::Unit::TestCase def test_seqpacket_pair s1, s2 = UNIXSocket.pair(Socket::SOCK_SEQPACKET) - assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) } + assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) } s2.send("", 0) s2.send("haha", 0) s2.send("", 0) @@ -149,7 +149,7 @@ class TestUNIXSocket < Test::Unit::TestCase assert_equal("haha", s1.recv(10)) assert_equal("", s1.recv(10)) assert_equal("", s1.recv(10)) - assert_raise(Errno::EAGAIN) { s1.recvfrom_nonblock(10) } + assert_raise(Errno::EAGAIN) { s1.recv_nonblock(10) } rescue Errno::EPROTONOSUPPORT ensure s1.close if s1 |