3 files changed, 74 insertions, 78 deletions
diff --git a/spec/ruby/library/socket/shared/address.rb b/spec/ruby/library/socket/shared/address.rb
index f3be9cfb99..49ba17c400 100644
--- a/spec/ruby/library/socket/shared/address.rb
+++ b/spec/ruby/library/socket/shared/address.rb
@@ -129,41 +129,51 @@ describe :socket_local_remote_address, shared: true do
     end
   end
 
-  with_feature :unix_socket do
-    describe 'using UNIXSocket' do
-      before :each do
-        @path = SocketSpecs.socket_path
-        @s = UNIXServer.new(@path)
-        @a = UNIXSocket.new(@path)
-        @b = @s.accept
-        @addr = @object.call(@a)
-      end
+  describe 'using UNIXSocket' do
+    before :each do
+      @path = SocketSpecs.socket_path
+      @s = UNIXServer.new(@path)
+      @a = UNIXSocket.new(@path)
+      @b = @s.accept
+      @addr = @object.call(@a)
+    end
 
-      after :each do
-        [@b, @a, @s].each(&:close)
-        rm_r(@path)
-      end
+    after :each do
+      [@b, @a, @s].each(&:close)
+      rm_r(@path)
+    end
 
-      it 'uses AF_UNIX as the address family' do
-        @addr.afamily.should == Socket::AF_UNIX
-      end
+    it 'uses AF_UNIX as the address family' do
+      @addr.afamily.should == Socket::AF_UNIX
+    end
 
-      it 'uses PF_UNIX as the protocol family' do
-        @addr.pfamily.should == Socket::PF_UNIX
-      end
+    it 'uses PF_UNIX as the protocol family' do
+      @addr.pfamily.should == Socket::PF_UNIX
+    end
 
-      it 'uses SOCK_STREAM as the socket type' do
-        @addr.socktype.should == Socket::SOCK_STREAM
+    it 'uses SOCK_STREAM as the socket type' do
+      @addr.socktype.should == Socket::SOCK_STREAM
+    end
+
+    it 'uses the correct socket path' do
+      if @method == :local_address
+        @addr.unix_path.should == ""
+      else
+        @addr.unix_path.should == @path
       end
+    end
 
-      it 'uses the correct socket path' do
+    platform_is_not :windows do
+      it 'equals address of peer socket' do
         if @method == :local_address
-          @addr.unix_path.should == ""
+          @addr.to_s.should == @b.remote_address.to_s
         else
-          @addr.unix_path.should == @path
+          @addr.to_s.should == @b.local_address.to_s
         end
       end
+    end
 
+    guard -> { platform_is :windows and ruby_bug "#21702", ""..."4.2" } do
       it 'equals address of peer socket' do
         if @method == :local_address
           @addr.to_s.should == @b.remote_address.to_s
@@ -171,23 +181,23 @@ describe :socket_local_remote_address, shared: true do
           @addr.to_s.should == @b.local_address.to_s
         end
       end
+    end
 
-      it 'returns an Addrinfo' do
-        @addr.should be_an_instance_of(Addrinfo)
-      end
+    it 'returns an Addrinfo' do
+      @addr.should be_an_instance_of(Addrinfo)
+    end
 
-      it 'uses 0 as the protocol' do
-        @addr.protocol.should == 0
-      end
+    it 'uses 0 as the protocol' do
+      @addr.protocol.should == 0
+    end
 
-      it 'can be used to connect to the server' do
-        skip if @method == :local_address
-        b = @addr.connect
-        begin
-          b.remote_address.to_s.should == @addr.to_s
-        ensure
-          b.close
-        end
+    it 'can be used to connect to the server' do
+      skip if @method == :local_address
+      b = @addr.connect
+      begin
+        b.remote_address.to_s.should == @addr.to_s
+      ensure
+        b.close
       end
     end
   end
diff --git a/spec/ruby/library/socket/shared/pack_sockaddr.rb b/spec/ruby/library/socket/shared/pack_sockaddr.rb
index 9f6238e7bc..4bfcf4edb9 100644
--- a/spec/ruby/library/socket/shared/pack_sockaddr.rb
+++ b/spec/ruby/library/socket/shared/pack_sockaddr.rb
@@ -17,13 +17,14 @@ describe :socket_pack_sockaddr_in, shared: true do
 
     sockaddr_in = Socket.public_send(@method, nil, '127.0.0.1')
     Socket.unpack_sockaddr_in(sockaddr_in).should == [0, '127.0.0.1']
+
+    sockaddr_in = Socket.public_send(@method, 80, Socket::INADDR_ANY)
+    Socket.unpack_sockaddr_in(sockaddr_in).should == [80, '0.0.0.0']
   end
 
-  platform_is_not :solaris do
-    it 'resolves the service name to a port' do
-      sockaddr_in = Socket.public_send(@method, 'http', '127.0.0.1')
-      Socket.unpack_sockaddr_in(sockaddr_in).should == [80, '127.0.0.1']
-    end
+  it 'resolves the service name to a port' do
+    sockaddr_in = Socket.public_send(@method, 'http', '127.0.0.1')
+    Socket.unpack_sockaddr_in(sockaddr_in).should == [80, '127.0.0.1']
   end
 
   describe 'using an IPv4 address' do
@@ -35,47 +36,32 @@ describe :socket_pack_sockaddr_in, shared: true do
     end
   end
 
-  platform_is_not :solaris do
-    describe 'using an IPv6 address' do
-      it 'returns a String of 28 bytes' do
-        str = Socket.public_send(@method, 80, '::1')
-
-        str.should be_an_instance_of(String)
-        str.bytesize.should == 28
-      end
-    end
-  end
-
-  platform_is :solaris do
-    describe 'using an IPv6 address' do
-      it 'returns a String of 32 bytes' do
-        str = Socket.public_send(@method, 80, '::1')
+  describe 'using an IPv6 address' do
+    it 'returns a String of 28 bytes' do
+      str = Socket.public_send(@method, 80, '::1')
 
-        str.should be_an_instance_of(String)
-        str.bytesize.should == 32
-      end
+      str.should be_an_instance_of(String)
+      str.bytesize.should == 28
     end
   end
 end
 
 describe :socket_pack_sockaddr_un, shared: true do
-  with_feature :unix_socket do
-    it 'should be idempotent' do
-      bytes = Socket.public_send(@method, '/tmp/foo').bytes
-      bytes[2..9].should == [47, 116, 109, 112, 47, 102, 111, 111]
-      bytes[10..-1].all?(&:zero?).should == true
-    end
+  it 'should be idempotent' do
+    bytes = Socket.public_send(@method, '/tmp/foo').bytes
+    bytes[2..9].should == [47, 116, 109, 112, 47, 102, 111, 111]
+    bytes[10..-1].all?(&:zero?).should == true
+  end
 
-    it "packs and unpacks" do
-      sockaddr_un = Socket.public_send(@method, '/tmp/s')
-      Socket.unpack_sockaddr_un(sockaddr_un).should == '/tmp/s'
-    end
+  it "packs and unpacks" do
+    sockaddr_un = Socket.public_send(@method, '/tmp/s')
+    Socket.unpack_sockaddr_un(sockaddr_un).should == '/tmp/s'
+  end
 
-    it "handles correctly paths with multibyte chars" do
-      sockaddr_un = Socket.public_send(@method, '/home/вася/sock')
-      path = Socket.unpack_sockaddr_un(sockaddr_un).encode('UTF-8', 'UTF-8')
-      path.should == '/home/вася/sock'
-    end
+  it "handles correctly paths with multibyte chars" do
+    sockaddr_un = Socket.public_send(@method, '/home/вася/sock')
+    path = Socket.unpack_sockaddr_un(sockaddr_un).encode('UTF-8', 'UTF-8')
+    path.should == '/home/вася/sock'
   end
 
   platform_is :linux do
@@ -96,7 +82,7 @@ describe :socket_pack_sockaddr_un, shared: true do
     end
   end
 
-  platform_is_not :windows, :aix do
+  platform_is_not :aix do
     it "raises ArgumentError for paths that are too long" do
       # AIX doesn't raise error
       long_path = 'a' * 110
diff --git a/spec/ruby/library/socket/shared/partially_closable_sockets.rb b/spec/ruby/library/socket/shared/partially_closable_sockets.rb
index 1bdff08bf6..b1c2ebabe1 100644
--- a/spec/ruby/library/socket/shared/partially_closable_sockets.rb
+++ b/spec/ruby/library/socket/shared/partially_closable_sockets.rb
@@ -1,4 +1,4 @@
-describe "partially closable sockets", shared: true do
+describe :partially_closable_sockets, shared: true do
   it "if the write end is closed then the other side can read past EOF without blocking" do
     @s1.write("foo")
     @s1.close_write