jruby · Oct 19, 2015 · Oct 19, 2015
Showing with 14 additions and 4 deletions.

+2 −2 lib/ruby/truffle/rubysl/rubysl-socket/lib/rubysl/socket.rb

+7 −2 spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb

+5 −0 spec/ruby/library/socket/tcpserver/accept_spec.rb
diff --git a/lib/ruby/truffle/rubysl/rubysl-socket/lib/rubysl/socket.rb b/lib/ruby/truffle/rubysl/rubysl-socket/lib/rubysl/socket.rb
@@ -564,7 +564,7 @@ def listen(backlog)
     end
 
     def accept
-      return if closed?
+      raise IOError, "closed stream" if closed? # Truffle: comply with MRI
 
       fd = super
 
@@ -578,7 +578,7 @@ def accept
     # Set nonblocking and accept.
     #
     def accept_nonblock
-      return if closed?
+      raise IOError, "closed stream" if closed? # Truffle: comply with MRI
 
       fcntl(Fcntl::F_SETFL, Fcntl::O_NONBLOCK)
 

diff --git a/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb b/spec/ruby/library/socket/tcpserver/accept_nonblock_spec.rb
@@ -3,11 +3,11 @@
 
 describe "Socket::TCPServer.accept_nonblock" do
   before :each do
-    @server =  TCPServer.new("127.0.0.1", SocketSpecs.port)
+    @server = TCPServer.new("127.0.0.1", SocketSpecs.port)
   end
 
   after :each do
-    @server.close
+    @server.close unless @server.closed?
   end
 
   it "accepts non blocking connections" do
@@ -28,4 +28,9 @@
     c.close
     s.close
   end
+
+  it "raises an IOError if the socket is closed" do
+    @server.close
+    lambda { @server.accept }.should raise_error(IOError)
+  end
 end
diff --git a/spec/ruby/library/socket/tcpserver/accept_spec.rb b/spec/ruby/library/socket/tcpserver/accept_spec.rb
@@ -58,4 +58,9 @@
     t.raise ex
     lambda { t.join }.should raise_error(Exception)
   end
+
+  it "raises an IOError if the socket is closed" do
+    @server.close
+    lambda { @server.accept }.should raise_error(IOError)
+  end
 end