summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/socket/test_tcp.rb13
2 files changed, 9 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index c11a8bc4e..45258df18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 23 23:19:15 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/socket/test_tcp.rb (test_recvfrom): replace an irrelevant test
+ for old behavior.
+
Wed Jul 23 21:38:16 2008 Yusuke Endoh <mame@tsg.ne.jp>
* test/ruby/test_marshal.rb: suppress warning during test.
diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb
index aa07d96cf..3aa7be82c 100644
--- a/test/socket/test_tcp.rb
+++ b/test/socket/test_tcp.rb
@@ -8,22 +8,17 @@ end
class TestTCPSocket < Test::Unit::TestCase
def test_recvfrom
assert false, "TODO: doesn't work on mswin32/64" if /mswin/ =~ RUBY_PLATFORM
- c = s = nil
svr = TCPServer.new("localhost", 0)
th = Thread.new {
c = svr.accept
- Thread.pass
- ObjectSpace.each_object(String) {|s|
- s.replace "a" if s.length == 0x10000 and !s.frozen?
- }
- c.print("x"*0x1000)
+ c.write "foo"
+ c.close
}
addr = svr.addr
sock = TCPSocket.open(addr[2], addr[1])
- assert_raise(RuntimeError, SocketError, "[ruby-dev:24705]") {
- sock.recvfrom(0x10000)
- }
+ assert_equal(["foo", nil], sock.recvfrom(0x10000))
ensure
+ th.kill
th.join
end
end if defined?(TCPSocket)