1 files changed, 35 insertions, 21 deletions

diff --git a/spec/ruby/core/process/wait_spec.rb b/spec/ruby/core/process/wait_spec.rb
index f393a99e0f..5a1889487c 100644
--- a/spec/ruby/core/process/wait_spec.rb
+++ b/spec/ruby/core/process/wait_spec.rb
@@ -7,34 +7,44 @@ describe "Process.wait" do
   before :all do
     begin
       leaked = Process.waitall
-      puts "leaked before wait specs: #{leaked}" unless leaked.empty?
-      # Ruby-space should not see PIDs used by mjit
-      leaked.should be_empty
+      # Ruby-space should not see PIDs used by rjit
+      raise "subprocesses leaked before wait specs: #{leaked}" unless leaked.empty?
     rescue NotImplementedError
     end
   end
 
   it "raises an Errno::ECHILD if there are no child processes" do
-    -> { Process.wait }.should raise_error(Errno::ECHILD)
+    -> { Process.wait }.should.raise(Errno::ECHILD)
   end
 
-  platform_is_not :windows do
-    it "returns its child pid" do
-      pid = Process.spawn(ruby_cmd('exit'))
-      Process.wait.should == pid
-    end
+  it "returns its child pid" do
+    pid = Process.spawn(ruby_cmd('exit'))
+    Process.wait.should == pid
+  end
 
-    it "sets $? to a Process::Status" do
-      pid = Process.spawn(ruby_cmd('exit'))
-      Process.wait
-      $?.should be_kind_of(Process::Status)
-      $?.pid.should == pid
+  it "returns nil when the process has not yet completed and WNOHANG is specified" do
+    cmd = platform_is(:windows) ? "timeout" : "sleep"
+    pid = spawn("#{cmd} 5")
+    begin
+      Process.wait(pid, Process::WNOHANG).should == nil
+      Process.kill("KILL", pid)
+    ensure
+      Process.wait(pid)
     end
+  end
 
+  it "sets $? to a Process::Status" do
+    pid = Process.spawn(ruby_cmd('exit'))
+    Process.wait
+    $?.should.is_a?(Process::Status)
+    $?.pid.should == pid
+  end
+
+  platform_is_not :windows do
     it "waits for any child process if no pid is given" do
       pid = Process.spawn(ruby_cmd('exit'))
       Process.wait.should == pid
-      -> { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid) }.should.raise(Errno::ESRCH)
     end
 
     it "waits for a specific child if a pid is given" do
@@ -42,14 +52,14 @@ describe "Process.wait" do
       pid2 = Process.spawn(ruby_cmd('exit'))
       Process.wait(pid2).should == pid2
       Process.wait(pid1).should == pid1
-      -> { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
-      -> { Process.kill(0, pid2) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid1) }.should.raise(Errno::ESRCH)
+      -> { Process.kill(0, pid2) }.should.raise(Errno::ESRCH)
     end
 
     it "coerces the pid to an Integer" do
       pid1 = Process.spawn(ruby_cmd('exit'))
       Process.wait(mock_int(pid1)).should == pid1
-      -> { Process.kill(0, pid1) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid1) }.should.raise(Errno::ESRCH)
     end
 
     # This spec is probably system-dependent.
@@ -60,8 +70,10 @@ describe "Process.wait" do
       Process.wait(0).should == pid2
       Process.wait.should == pid1
     end
+  end
 
-    # This spec is probably system-dependent.
+  # This spec is probably system-dependent.
+  guard -> { Process.respond_to?(:fork) } do
     it "doesn't block if no child is available when WNOHANG is used" do
       read, write = IO.pipe
       pid = Process.fork do
@@ -72,7 +84,7 @@ describe "Process.wait" do
         sleep
       end
 
-      Process.wait(pid, Process::WNOHANG).should be_nil
+      Process.wait(pid, Process::WNOHANG).should == nil
 
       # wait for the child to setup its TERM handler
       write.close
@@ -82,11 +94,13 @@ describe "Process.wait" do
       Process.kill("TERM", pid)
       Process.wait.should == pid
     end
+  end
 
+  platform_is_not :windows do
     it "always accepts flags=0" do
       pid = Process.spawn(ruby_cmd('exit'))
       Process.wait(-1, 0).should == pid
-      -> { Process.kill(0, pid) }.should raise_error(Errno::ESRCH)
+      -> { Process.kill(0, pid) }.should.raise(Errno::ESRCH)
     end
   end
 end