Removed Solaris conditions from library directory

Author: hsbt

library/socket/addrinfo/getaddrinfo_spec.rb

@@ -73,19 +73,15 @@
     end
   end
 
-  platform_is_not :'solaris2.10' do # i386-solaris
-    it 'sets a custom socket protocol of the Addrinfo instances' do
-      array = Addrinfo.getaddrinfo('127.0.0.1', 80, nil, nil, Socket::IPPROTO_UDP)
+  it 'sets a custom socket protocol of the Addrinfo instances' do
+    array = Addrinfo.getaddrinfo('127.0.0.1', 80, nil, nil, Socket::IPPROTO_UDP)
 
-      array[0].protocol.should == Socket::IPPROTO_UDP
-    end
+    array[0].protocol.should == Socket::IPPROTO_UDP
   end
 
-  platform_is_not :solaris do
-    it 'sets the canonical name when AI_CANONNAME is given as a flag' do
-      array = Addrinfo.getaddrinfo('localhost', 80, nil, nil, nil, Socket::AI_CANONNAME)
+  it 'sets the canonical name when AI_CANONNAME is given as a flag' do
+    array = Addrinfo.getaddrinfo('localhost', 80, nil, nil, nil, Socket::AI_CANONNAME)
 
-      array[0].canonname.should be_an_instance_of(String)
-    end
+    array[0].canonname.should be_an_instance_of(String)
   end
 end

library/socket/addrinfo/initialize_spec.rb

@@ -362,7 +362,7 @@
           end
         end
 
-        platform_is_not :windows, :aix, :solaris do
+        platform_is_not :windows, :aix do
           (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
             it "raises SocketError when using #{type}" do
               value = Socket.const_get(type)
@@ -390,7 +390,7 @@
           end
         end
 
-        platform_is_not :windows, :aix, :solaris do
+        platform_is_not :windows, :aix do
           (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
             it "raises SocketError when using #{type}" do
               value = Socket.const_get(type)
@@ -495,7 +495,7 @@
           end
         end
 
-        platform_is_not :windows, :aix, :solaris do
+        platform_is_not :windows, :aix do
           (Socket.constants.grep(/^IPPROTO/) - valid).each do |type|
             it "raises SocketError when using #{type}" do
               value = Socket.const_get(type)

library/socket/addrinfo/marshal_dump_spec.rb

@@ -32,10 +32,8 @@
         @array[3].should == 'SOCK_STREAM'
       end
 
-      platform_is_not :'solaris2.10' do # i386-solaris
-        it 'includes the protocol as the 5th value' do
-          @array[4].should == 'IPPROTO_TCP'
-        end
+      it 'includes the protocol as the 5th value' do
+        @array[4].should == 'IPPROTO_TCP'
       end
 
       it 'includes the canonical name as the 6th value' do

library/socket/addrinfo/udp_spec.rb

@@ -27,10 +27,8 @@
       Addrinfo.udp(ip_address, 80).socktype.should == Socket::SOCK_DGRAM
     end
 
-    platform_is_not :solaris do
-      it 'sets the socket protocol' do
-        Addrinfo.udp(ip_address, 80).protocol.should == Socket::IPPROTO_UDP
-      end
+    it 'sets the socket protocol' do
+      Addrinfo.udp(ip_address, 80).protocol.should == Socket::IPPROTO_UDP
     end
   end
 end

library/socket/ancillarydata/initialize_spec.rb

@@ -106,7 +106,7 @@
         Socket::AncillaryData.new(:INET, :SOCKET, :RIGHTS, '').type.should == Socket::SCM_RIGHTS
       end
 
-      platform_is_not :"solaris2.10", :aix do
+      platform_is_not :aix do
         it 'sets the type to SCM_TIMESTAMP when using :TIMESTAMP as the type argument' do
           Socket::AncillaryData.new(:INET, :SOCKET, :TIMESTAMP, '').type.should == Socket::SCM_TIMESTAMP
         end

library/socket/ancillarydata/unix_rights_spec.rb

@@ -50,7 +50,7 @@
       -> { data.unix_rights }.should raise_error(TypeError)
     end
 
-    platform_is_not :"solaris2.10", :aix do
+    platform_is_not :aix do
       it 'raises TypeError when the type is not SCM_RIGHTS' do
         data = Socket::AncillaryData.new(:INET, :SOCKET, :TIMESTAMP, '')
 

library/socket/basicsocket/recv_spec.rb

@@ -32,28 +32,26 @@
     ScratchPad.recorded.should == 'hello'
   end
 
-  platform_is_not :solaris do
-    it "accepts flags to specify unusual receiving behaviour" do
-      t = Thread.new do
-        client = @server.accept
+  it "accepts flags to specify unusual receiving behaviour" do
+    t = Thread.new do
+      client = @server.accept
 
-        # in-band data (TCP), doesn't receive the flag.
-        ScratchPad.record client.recv(10)
+      # in-band data (TCP), doesn't receive the flag.
+      ScratchPad.record client.recv(10)
 
-        # this recv is important (TODO: explain)
-        client.recv(10)
-        client.close
-      end
-      Thread.pass while t.status and t.status != "sleep"
-      t.status.should_not be_nil
-
-      socket = TCPSocket.new('127.0.0.1', @port)
-      socket.send('helloU', Socket::MSG_OOB)
-      socket.shutdown(1)
-      t.join
-      socket.close
-      ScratchPad.recorded.should == 'hello'
+      # this recv is important (TODO: explain)
+      client.recv(10)
+      client.close
     end
+    Thread.pass while t.status and t.status != "sleep"
+    t.status.should_not be_nil
+
+    socket = TCPSocket.new('127.0.0.1', @port)
+    socket.send('helloU', Socket::MSG_OOB)
+    socket.shutdown(1)
+    t.join
+    socket.close
+    ScratchPad.recorded.should == 'hello'
   end
 
   it "gets lines delimited with a custom separator"  do

library/socket/basicsocket/send_spec.rb

@@ -38,7 +38,7 @@
     data.should == 'hello'
   end
 
-  platform_is_not :solaris, :windows do
+  platform_is_not :windows do
     it "accepts flags to specify unusual sending behaviour" do
       data = nil
       peek_data = nil

library/socket/constants/constants_spec.rb

@@ -68,7 +68,7 @@
     end
   end
 
-  platform_is_not :solaris, :windows, :aix, :android do
+  platform_is_not :windows, :aix, :android do
     it "defines multicast options" do
       consts = ["IP_MAX_MEMBERSHIPS"]
       consts.each do |c|

library/socket/shared/pack_sockaddr.rb

@@ -22,11 +22,9 @@
     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
@@ -38,25 +36,12 @@
     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')
+  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')
-
-        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