Update to ruby/spec@cdd6ff7

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66041 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 33 insertions, 9 deletions

diff --git a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
index 0012b5ada7..c56bebee62 100644
--- a/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
+++ b/spec/ruby/library/socket/socket/connect_nonblock_spec.rb
@@ -99,19 +99,43 @@ describe 'Socket#connect_nonblock' do
       end
     end
 
-    platform_is_not :freebsd, :solaris do
-      describe 'using a STREAM socket' do
-        before do
-          @server   = Socket.new(family, :STREAM)
-          @client   = Socket.new(family, :STREAM)
-          @sockaddr = Socket.sockaddr_in(0, ip_address)
+    describe 'using a STREAM socket' do
+      before do
+        @server   = Socket.new(family, :STREAM)
+        @client   = Socket.new(family, :STREAM)
+        @sockaddr = Socket.sockaddr_in(0, ip_address)
+      end
+
+      after do
+        @client.close
+        @server.close
+      end
+
+      platform_is_not :windows do
+        it 'raises Errno::EISCONN when already connected' do
+          @server.listen(1)
+          @client.connect(@server.getsockname).should == 0
+
+          lambda {
+            @client.connect_nonblock(@server.getsockname)
+
+            # A second call needed if non-blocking sockets become default
+            # XXX honestly I don't expect any real code to care about this spec
+            # as it's too implementation-dependent and checking for connect()
+            # errors is futile anyways because of TOCTOU
+            @client.connect_nonblock(@server.getsockname)
+          }.should raise_error(Errno::EISCONN)
         end
 
-        after do
-          @client.close
-          @server.close
+        it 'returns 0 when already connected in exceptionless mode' do
+          @server.listen(1)
+          @client.connect(@server.getsockname).should == 0
+
+          @client.connect_nonblock(@server.getsockname, exception: false).should == 0
         end
+      end
 
+      platform_is_not :freebsd, :solaris do
         it 'raises IO:EINPROGRESSWaitWritable when the connection would block' do
           @server.bind(@sockaddr)