1 files changed, 20 insertions, 4 deletions
diff --git a/spec/ruby/core/process/wait2_spec.rb b/spec/ruby/core/process/wait2_spec.rb
index 8e1ac763f1..5c57dd40fb 100644
--- a/spec/ruby/core/process/wait2_spec.rb
+++ b/spec/ruby/core/process/wait2_spec.rb
@@ -1,12 +1,19 @@
-require File.expand_path('../../../spec_helper', __FILE__)
+require_relative '../../spec_helper'
 
 describe "Process.wait2" do
   before :all do
     # HACK: this kludge is temporarily necessary because some
     # misbehaving spec somewhere else does not clear processes
+    # Note: background processes are unavoidable with RJIT,
+    # but we shouldn't reap them from Ruby-space
     begin
+      Process.wait(-1, Process::WNOHANG)
+      $stderr.puts "Leaked process before wait2 specs! Waiting for it"
       leaked = Process.waitall
-      puts "leaked before wait2 specs: #{leaked}" unless leaked.empty?
+      $stderr.puts "leaked before wait2 specs: #{leaked}" unless leaked.empty?
+      # Ruby-space should not see PIDs used by rjit
+      leaked.should.empty?
+    rescue Errno::ECHILD # No child processes
     rescue NotImplementedError
     end
   end
@@ -23,7 +30,16 @@ describe "Process.wait2" do
   end
 
   it "raises a StandardError if no child processes exist" do
-    lambda { Process.wait2 }.should raise_error(Errno::ECHILD)
-    lambda { Process.wait2 }.should raise_error(StandardError)
+    -> { Process.wait2 }.should.raise(Errno::ECHILD)
+    -> { Process.wait2 }.should.raise(StandardError)
+  end
+
+  it "returns nil if the child process is still running when given the WNOHANG flag" do
+    IO.popen(ruby_cmd('STDIN.getbyte'), "w") do |io|
+      pid, status = Process.wait2(io.pid, Process::WNOHANG)
+      pid.should == nil
+      status.should == nil
+      io.write('a')
+    end
   end
 end