1 files changed, 25 insertions, 19 deletions
diff --git a/spec/ruby/core/process/wait2_spec.rb b/spec/ruby/core/process/wait2_spec.rb
index d0163f80af..1fa6f76151 100644
--- a/spec/ruby/core/process/wait2_spec.rb
+++ b/spec/ruby/core/process/wait2_spec.rb
@@ -1,40 +1,46 @@
 require_relative '../../spec_helper'
+require_relative 'fixtures/common'
 
 describe "Process.wait2" do
+  ProcessSpecs.use_system_ruby(self)
+
   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 MJIT,
+    # Note: background processes are unavoidable with RJIT,
     # but we shouldn't reap them from Ruby-space
     begin
       Process.wait(-1, Process::WNOHANG)
-      without_feature :mjit do
-        $stderr.puts "Leaked process before wait2 specs! Waiting for it"
-      end
+      $stderr.puts "Leaked process before wait2 specs! Waiting for it"
       leaked = Process.waitall
       $stderr.puts "leaked before wait2 specs: #{leaked}" unless leaked.empty?
-      with_feature :mjit do
-        # Ruby-space should not see PIDs used by mjit
-        leaked.should be_empty
-      end
+      # Ruby-space should not see PIDs used by rjit
+      leaked.should.empty?
     rescue Errno::ECHILD # No child processes
     rescue NotImplementedError
     end
   end
 
-  platform_is_not :windows do
-    it "returns the pid and status of child process" do
-      pidf = Process.fork { Process.exit! 99 }
-      results = Process.wait2
-      results.size.should == 2
-      pidw, status = results
-      pidf.should == pidw
-      status.exitstatus.should == 99
-    end
+  it "returns the pid and status of child process" do
+    pidf = Process.spawn(*ruby_exe, "-e", "exit 99")
+    results = Process.wait2
+    results.size.should == 2
+    pidw, status = results
+    pidf.should == pidw
+    status.exitstatus.should == 99
   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