1 files changed, 68 insertions, 8 deletions
diff --git a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
index 8063723701..eabfb9dd18 100644
--- a/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
+++ b/spec/ruby/library/socket/basicsocket/recvmsg_spec.rb
@@ -41,7 +41,7 @@ describe 'BasicSocket#recvmsg' do
           end
 
           it 'returns an Array containing the data, an Addrinfo and the flags' do
-            @server.recvmsg.should be_an_instance_of(Array)
+            @server.recvmsg.should.instance_of?(Array)
           end
 
           describe 'without a maximum message length' do
@@ -66,12 +66,12 @@ describe 'BasicSocket#recvmsg' do
             end
 
             it 'stores an Addrinfo at index 1' do
-              @array[1].should be_an_instance_of(Addrinfo)
+              @array[1].should.instance_of?(Addrinfo)
             end
 
             platform_is_not :windows do
               it 'stores the flags at index 2' do
-                @array[2].should be_kind_of(Integer)
+                @array[2].should.is_a?(Integer)
               end
             end
 
@@ -144,7 +144,7 @@ describe 'BasicSocket#recvmsg' do
           end
 
           it 'returns an Array containing the data, an Addrinfo and the flags' do
-            @socket.recvmsg.should be_an_instance_of(Array)
+            @socket.recvmsg.should.instance_of?(Array)
           end
 
           describe 'the returned Array' do
@@ -157,11 +157,11 @@ describe 'BasicSocket#recvmsg' do
             end
 
             it 'stores an Addrinfo at index 1' do
-              @array[1].should be_an_instance_of(Addrinfo)
+              @array[1].should.instance_of?(Addrinfo)
             end
 
             it 'stores the flags at index 2' do
-              @array[2].should be_kind_of(Integer)
+              @array[2].should.is_a?(Integer)
             end
 
             describe 'the returned Addrinfo' do
@@ -170,7 +170,7 @@ describe 'BasicSocket#recvmsg' do
               end
 
               it 'raises when receiving the ip_address message' do
-                -> { @addr.ip_address }.should raise_error(SocketError)
+                -> { @addr.ip_address }.should.raise(SocketError)
               end
 
               it 'uses the correct address family' do
@@ -186,7 +186,7 @@ describe 'BasicSocket#recvmsg' do
               end
 
               it 'raises when receiving the ip_port message' do
-                -> { @addr.ip_port }.should raise_error(SocketError)
+                -> { @addr.ip_port }.should.raise(SocketError)
               end
             end
           end
@@ -195,3 +195,63 @@ describe 'BasicSocket#recvmsg' do
     end
   end
 end
+
+describe 'BasicSocket#recvmsg' do
+  context "when recvfrom(2) returns 0 (if no messages are available to be received and the peer has performed an orderly shutdown)" do
+    describe "stream socket" do
+      before :each do
+        @server = TCPServer.new('127.0.0.1', 0)
+        @port = @server.addr[1]
+      end
+
+      after :each do
+        @server.close unless @server.closed?
+      end
+
+      platform_is_not :windows do
+        it "returns nil on a closed stream socket" do
+          t = Thread.new do
+            client = @server.accept
+            client.recvmsg(10)
+          ensure
+            client.close if client
+          end
+
+          Thread.pass while t.status and t.status != "sleep"
+          t.status.should_not == nil
+
+          socket = TCPSocket.new('127.0.0.1', @port)
+          socket.close
+
+          t.value.should == nil
+        end
+      end
+    end
+
+    describe "datagram socket" do
+      SocketSpecs.each_ip_protocol do |family, ip_address|
+        before :each do
+          @server = UDPSocket.new(family)
+          @client = UDPSocket.new(family)
+        end
+
+        after :each do
+          @server.close unless @server.closed?
+          @client.close unless @client.closed?
+        end
+
+        it "returns an empty String as received data" do
+          @server.bind(ip_address, 0)
+          addr = @server.connect_address
+          @client.connect(addr.ip_address, addr.ip_port)
+
+          @client.send('', 0)
+          message = @server.recvmsg(1)
+
+          message.should.is_a? Array
+          message[0].should == ""
+        end
+      end
+    end
+  end
+end