1 files changed, 45 insertions, 4 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)