1 files changed, 108 insertions, 32 deletions
diff --git a/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb b/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb
index 3e2eb69885..9ae3777961 100644
--- a/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb
+++ b/spec/ruby/library/socket/unixsocket/recvfrom_spec.rb
@@ -2,35 +2,104 @@ require_relative '../spec_helper'
 require_relative '../fixtures/classes'
 
 describe "UNIXSocket#recvfrom" do
-  platform_is_not :windows do
-    before :each do
-      @path = SocketSpecs.socket_path
-      @server = UNIXServer.open(@path)
-      @client = UNIXSocket.open(@path)
+  before :each do
+    @path = SocketSpecs.socket_path
+    @server = UNIXServer.open(@path)
+    @client = UNIXSocket.open(@path)
+  end
+
+  after :each do
+    @client.close
+    @server.close
+    SocketSpecs.rm_socket @path
+  end
+
+  it "receives len bytes from sock, returning an array containing sent data as first element" do
+    @client.send("foobar", 0)
+    sock = @server.accept
+    sock.recvfrom(6).first.should == "foobar"
+    sock.close
+  end
+
+  context "when called on a server's socket" do
+    platform_is_not :windows do
+      it "returns an array containing basic information on the client as second element" do
+        @client.send("foobar", 0)
+        sock = @server.accept
+        data = sock.recvfrom(6)
+        data.last.should == ["AF_UNIX", ""]
+        sock.close
+      end
     end
 
-    after :each do
-      @client.close
-      @server.close
-      SocketSpecs.rm_socket @path
+    guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.2" } do
+      it "returns an array containing basic information on the client as second element" do
+        @client.send("foobar", 0)
+        sock = @server.accept
+        data = sock.recvfrom(6)
+        data.last.should == ["AF_UNIX", ""]
+        sock.close
+      end
     end
+  end
 
-    it "receives len bytes from sock" do
-      @client.send("foobar", 0)
-      sock = @server.accept
-      sock.recvfrom(6).first.should == "foobar"
-      sock.close
+  context "when called on a client's socket" do
+    platform_is :linux do
+      it "returns an array containing server's address as second element" do
+        @client.send("", 0)
+        sock = @server.accept
+        sock.send("barfoo", 0)
+        @client.recvfrom(6).last.should == ["AF_UNIX", @server.local_address.unix_path]
+        sock.close
+      end
     end
 
-    it "returns an array with data and information on the sender" do
-      @client.send("foobar", 0)
-      sock = @server.accept
-      data = sock.recvfrom(6)
-      data.first.should == "foobar"
-      data.last.should == ["AF_UNIX", ""]
-      sock.close
+    guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.2" } do
+      it "returns an array containing server's address as second element" do
+        @client.send("", 0)
+        sock = @server.accept
+        sock.send("barfoo", 0)
+        # This may not be correct, depends on what underlying recvfrom actually returns.
+        @client.recvfrom(6).last.should == ["AF_UNIX", @server.local_address.unix_path]
+        sock.close
+      end
     end
 
+    platform_is :darwin do
+      it "returns an array containing basic information on the server as second element" do
+        @client.send("", 0)
+        sock = @server.accept
+        sock.send("barfoo", 0)
+        @client.recvfrom(6).last.should == ["AF_UNIX", ""]
+        sock.close
+      end
+    end
+  end
+
+  it "allows an output buffer as third argument" do
+    buffer = +''
+
+    @client.send("foobar", 0)
+    sock = @server.accept
+    message, = sock.recvfrom(6, 0, buffer)
+    sock.close
+
+    message.should.equal?(buffer)
+    buffer.should == "foobar"
+  end
+
+  it "preserves the encoding of the given buffer" do
+    buffer = ''.encode(Encoding::ISO_8859_1)
+
+    @client.send("foobar", 0)
+    sock = @server.accept
+    sock.recvfrom(6, 0, buffer)
+    sock.close
+
+    buffer.encoding.should == Encoding::ISO_8859_1
+  end
+
+  platform_is_not :windows do
     it "uses different message options" do
       @client.send("foobar", Socket::MSG_PEEK)
       sock = @server.accept
@@ -44,30 +113,37 @@ describe "UNIXSocket#recvfrom" do
   end
 end
 
+describe 'UNIXSocket#recvfrom' do
+  describe 'using a socket pair' do
+    before do
+      @client, @server = UNIXSocket.socketpair
+      @client.write('hello')
+    end
 
-with_feature :unix_socket do
-  describe 'UNIXSocket#recvfrom' do
-    describe 'using a socket pair' do
-      before do
-        @client, @server = UNIXSocket.socketpair
-        @client.write('hello')
-      end
+    after do
+      @client.close
+      @server.close
+    end
 
-      after do
-        @client.close
-        @server.close
+    platform_is_not :windows do
+      it 'returns an Array containing the data and address information' do
+        @server.recvfrom(5).should == ['hello', ['AF_UNIX', '']]
       end
+    end
 
+    guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.2" } do
       it 'returns an Array containing the data and address information' do
         @server.recvfrom(5).should == ['hello', ['AF_UNIX', '']]
       end
     end
+  end
 
+  platform_is_not :windows do
     # These specs are taken from the rdoc examples on UNIXSocket#recvfrom.
     describe 'using a UNIX socket constructed using UNIXSocket.for_fd' do
       before do
         @path1 = SocketSpecs.socket_path
-        @path2 = SocketSpecs.socket_path + '2'
+        @path2 = SocketSpecs.socket_path.chop + '2'
         rm_r(@path2)
 
         @client_raw = Socket.new(:UNIX, :DGRAM)