diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-09 01:19:30 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-09 01:19:30 +0000 |
commit | 32481c4126c09a659dd240a44fe27a2af513dd52 (patch) | |
tree | 16a2e1d47612de8d9aa0db389a8c4b3a70f3278e /test | |
parent | bfb31fdd22e3d5680d87d926704caff374b77f3c (diff) | |
download | ruby-32481c4126c09a659dd240a44fe27a2af513dd52.tar.gz |
* test/socket/test_socket.rb (test_setsockopt): use SO_LINGER instead
of SO_BINDTODEVICE. fixed: [ruby-dev:25133]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/socket/test_socket.rb | 49 | ||||
-rw-r--r-- | test/socket/test_tcp.rb | 4 |
2 files changed, 48 insertions, 5 deletions
diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 1d2ba04bfd..c436484dde 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -5,15 +5,56 @@ rescue LoadError end class TestBasicSocket < Test::Unit::TestCase + def inet_stream + sock = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0) + yield sock + ensure + assert_raise(IOError) {sock.close} + end + + def test_getsockopt + inet_stream do |s| + n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_TYPE) + assert_equal([Socket::SOCK_STREAM].pack("i"), n) + n = s.getsockopt(Socket::SOL_SOCKET, Socket::SO_ERROR) + assert_equal([0].pack("i"), n) + val = Object.new + class << val; self end.send(:define_method, :to_int) { + s.close + Socket::SO_TYPE + } + assert_raise(IOError) { + n = s.getsockopt(Socket::SOL_SOCKET, val) + } + end + end + def test_setsockopt # [ruby-dev:25039] - s = Socket.new(Socket::AF_INET, Socket::SOCK_STREAM, 0) + s = nil + linger = [0, 0].pack("ii") + val = Object.new class << val; self end.send(:define_method, :to_str) { s.close - "eth0" + linger } - assert_raise(IOError) { - s.setsockopt(Socket::SOL_SOCKET, Socket::SO_BINDTODEVICE, val) + inet_stream do |s| + assert_equal(0, s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, linger)) + + assert_raise(IOError) { + s.setsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER, val) + } + end + + val = Object.new + class << val; self end.send(:define_method, :to_int) { + s.close + Socket::SO_LINGER } + inet_stream do |s| + assert_raise(IOError) { + s.setsockopt(Socket::SOL_SOCKET, val, linger) + } + end end end if defined?(Socket) diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb index a1657f027d..596919082f 100644 --- a/test/socket/test_tcp.rb +++ b/test/socket/test_tcp.rb @@ -9,7 +9,7 @@ class TestTCPSocket < Test::Unit::TestCase def test_recvfrom # [ruby-dev:24705] c = s = nil svr = TCPServer.new("localhost", 0) - Thread.new { + th = Thread.new { c = svr.accept ObjectSpace.each_object(String) {|s| s.replace "a" if s.length == 0x10000 and !s.frozen? @@ -21,5 +21,7 @@ class TestTCPSocket < Test::Unit::TestCase assert_raise(RuntimeError, SocketError) { sock.recvfrom(0x10000) } + ensure + th.join end end if defined?(TCPSocket) |