1 files changed, 110 insertions, 45 deletions
diff --git a/spec/ruby/library/socket/unixserver/accept_spec.rb b/spec/ruby/library/socket/unixserver/accept_spec.rb
index 3921dadd9d..8f3ea50966 100644
--- a/spec/ruby/library/socket/unixserver/accept_spec.rb
+++ b/spec/ruby/library/socket/unixserver/accept_spec.rb
@@ -1,61 +1,126 @@
-require File.expand_path('../../../../spec_helper', __FILE__)
-require File.expand_path('../../fixtures/classes', __FILE__)
-
-platform_is_not :windows do
-  describe "UNIXServer#accept" do
-    before :each do
-      @path = SocketSpecs.socket_path
-      @server = UNIXServer.open(@path)
+require_relative '../spec_helper'
+require_relative '../fixtures/classes'
+
+describe "UNIXServer#accept" do
+  before :each do
+    @path = SocketSpecs.socket_path
+    @server = UNIXServer.open(@path)
+  end
+
+  after :each do
+    @server.close if @server
+    SocketSpecs.rm_socket @path
+  end
+
+  it "accepts what is written by the client" do
+    client = UNIXSocket.open(@path)
+
+    client.send('hello', 0)
+
+    sock = @server.accept
+    begin
+      data, info = sock.recvfrom(5)
+
+      data.should == 'hello'
+      info.should_not.empty?
+    ensure
+      sock.close
+      client.close
     end
+  end
+
+  it "can be interrupted by Thread#kill" do
+    t = Thread.new {
+      @server.accept
+    }
+    Thread.pass while t.status and t.status != "sleep"
 
-    after :each do
-      @server.close if @server
-      SocketSpecs.rm_socket @path
+    # kill thread, ensure it dies in a reasonable amount of time
+    t.kill
+    a = 0
+    while t.alive? and a < 5000
+      sleep 0.001
+      a += 1
     end
+    a.should < 5000
+  end
+
+  it "can be interrupted by Thread#raise" do
+    t = Thread.new {
+      -> {
+        @server.accept
+      }.should.raise(Exception, "interrupted")
+    }
+
+    Thread.pass while t.status and t.status != "sleep"
+    t.raise Exception, "interrupted"
+    t.join
+  end
+end
 
-    it "accepts what is written by the client" do
-      client = UNIXSocket.open(@path)
+describe 'UNIXServer#accept' do
+  before do
+    @path = SocketSpecs.socket_path
+    @server = UNIXServer.new(@path)
+  end
 
-      client.send('hello', 0)
+  after do
+    @server.close
+    rm_r(@path)
+  end
 
-      sock = @server.accept
-      begin
-        data, info = sock.recvfrom(5)
+  describe 'without a client' do
+    it 'blocks the calling thread' do
+      -> { @server.accept }.should block_caller
+    end
+  end
 
-        data.should == 'hello'
-        info.should_not be_empty
-      ensure
-        sock.close
-        client.close
-      end
+  describe 'with a client' do
+    before do
+      @client = UNIXSocket.new(@path)
     end
 
-    it "can be interrupted by Thread#kill" do
-      t = Thread.new {
-        @server.accept
-      }
-      Thread.pass while t.status and t.status != "sleep"
-
-      # kill thread, ensure it dies in a reasonable amount of time
-      t.kill
-      a = 0
-      while t.alive? and a < 5000
-        sleep 0.001
-        a += 1
+    after do
+      @client.close
+      @socket.close if @socket
+    end
+
+    describe 'without any data' do
+      it 'returns a UNIXSocket' do
+        @socket = @server.accept
+        @socket.should.instance_of?(UNIXSocket)
       end
-      a.should < 5000
     end
 
-    it "can be interrupted by Thread#raise" do
-      t = Thread.new {
-        -> {
-          @server.accept
-        }.should raise_error(Exception, "interrupted")
-      }
+    describe 'with data available' do
+      before do
+        @client.write('hello')
+      end
+
+      it 'returns a UNIXSocket' do
+        @socket = @server.accept
+        @socket.should.instance_of?(UNIXSocket)
+      end
 
-      Thread.pass while t.status and t.status != "sleep"
-      t.raise Exception, "interrupted"
-      t.join
+      describe 'the returned UNIXSocket' do
+        it 'can read the data written' do
+          @socket = @server.accept
+          @socket.recv(5).should == 'hello'
+        end
+
+        platform_is_not :windows do
+          it "is set to nonblocking" do
+            require 'io/nonblock'
+            @socket = @server.accept
+            @socket.should.nonblock?
+          end
+        end
+
+        it "is set to close on exec" do
+          @socket = @server.accept
+          @socket.should.close_on_exec?
+        end
+      end
     end
   end
 end