summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-01 06:23:21 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-01 06:23:21 +0000
commitef908a25d8e2d5b1796d9f0d92c2df5dec8c6d78 (patch)
tree1756dddbced3bcf6259f0b59e28b5aa24913c3f9
parente587cf273099ee1e0dbaafdc47f220ea8b81e2e9 (diff)
* test/socket/test_nonblock.rb: add timeout to send/receive
an empty UDP packet. [ruby-dev:28820] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10441 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--test/socket/test_nonblock.rb7
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9abbf139c5..f2e0586071 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Jul 1 15:15:49 2006 Tanaka Akira <akr@m17n.org>
+
+ * test/socket/test_nonblock.rb: add timeout to send/receive
+ an empty UDP packet.
+ [ruby-dev:28820]
+
Fri Jun 30 23:46:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* configure.in: should test isinf for Solaris with GCC compiler.
diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb
index 07d0004e70..180700c366 100644
--- a/test/socket/test_nonblock.rb
+++ b/test/socket/test_nonblock.rb
@@ -5,6 +5,7 @@ end
require "test/unit"
require "tempfile"
+require "timeout"
class TestNonblockSocket < Test::Unit::TestCase
def test_accept_nonblock
@@ -63,7 +64,7 @@ class TestNonblockSocket < Test::Unit::TestCase
assert_equal(u2_port, port)
assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { u1.recvfrom_nonblock(100) }
u2.send("", 0, u1.getsockname)
- IO.select [u1]
+ assert_nothing_raised { timeout(1) { IO.select [u1] } }
mesg, inet_addr = u1.recvfrom_nonblock(100)
assert_equal("", mesg)
ensure
@@ -83,7 +84,7 @@ class TestNonblockSocket < Test::Unit::TestCase
assert_equal("aaa", mesg)
assert_raise(Errno::EAGAIN, Errno::EWOULDBLOCK) { u1.recv_nonblock(100) }
u2.send("", 0, u1.getsockname)
- IO.select [u1]
+ assert_nothing_raised { timeout(1) { IO.select [u1] } }
mesg = u1.recv_nonblock(100)
assert_equal("", mesg)
ensure
@@ -147,6 +148,7 @@ class TestNonblockSocket < Test::Unit::TestCase
s.close if s
end
+=begin
def test_write_nonblock
c, s = tcp_pair
str = "a" * 10000
@@ -168,5 +170,6 @@ class TestNonblockSocket < Test::Unit::TestCase
c.close if c
s.close if s
end
+=end
end if defined?(Socket)