diff options
Diffstat (limited to 'spec/ruby/core/process/status')
-rw-r--r-- | spec/ruby/core/process/status/equal_value_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/process/status/exited_spec.rb | 7 | ||||
-rw-r--r-- | spec/ruby/core/process/status/exitstatus_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/process/status/signaled_spec.rb | 6 | ||||
-rw-r--r-- | spec/ruby/core/process/status/success_spec.rb | 14 | ||||
-rw-r--r-- | spec/ruby/core/process/status/termsig_spec.rb | 4 | ||||
-rw-r--r-- | spec/ruby/core/process/status/to_i_spec.rb | 4 |
7 files changed, 12 insertions, 31 deletions
diff --git a/spec/ruby/core/process/status/equal_value_spec.rb b/spec/ruby/core/process/status/equal_value_spec.rb index 444ce1775b..d85bb22214 100644 --- a/spec/ruby/core/process/status/equal_value_spec.rb +++ b/spec/ruby/core/process/status/equal_value_spec.rb @@ -2,13 +2,13 @@ require_relative '../../../spec_helper' describe "Process::Status#==" do it "returns true when compared to the integer status of an exited child" do - ruby_exe("exit(29)") + ruby_exe("exit(29)", exit_status: 29) $?.to_i.should == $? $?.should == $?.to_i end it "returns true when compared to the integer status of a terminated child" do - ruby_exe("Process.kill(:KILL, $$); exit(29)") + ruby_exe("Process.kill(:KILL, $$); exit(29)", exit_status: platform_is(:windows) ? 0 : nil) $?.to_i.should == $? $?.should == $?.to_i end diff --git a/spec/ruby/core/process/status/exited_spec.rb b/spec/ruby/core/process/status/exited_spec.rb index 0ae3f9e7ae..059cd5b1aa 100644 --- a/spec/ruby/core/process/status/exited_spec.rb +++ b/spec/ruby/core/process/status/exited_spec.rb @@ -1,9 +1,7 @@ require_relative '../../../spec_helper' describe "Process::Status#exited?" do - describe "for a child that exited normally" do - before :each do ruby_exe("exit(0)") end @@ -15,9 +13,8 @@ describe "Process::Status#exited?" do describe "for a terminated child" do - before :each do - ruby_exe("Process.kill(:KILL, $$); exit(42)") + ruby_exe("Process.kill(:KILL, $$); exit(42)", exit_status: platform_is(:windows) ? 0 : nil) end platform_is_not :windows do @@ -31,7 +28,5 @@ describe "Process::Status#exited?" do $?.exited?.should be_true end end - end - end diff --git a/spec/ruby/core/process/status/exitstatus_spec.rb b/spec/ruby/core/process/status/exitstatus_spec.rb index d6c6965b9e..3087bd619e 100644 --- a/spec/ruby/core/process/status/exitstatus_spec.rb +++ b/spec/ruby/core/process/status/exitstatus_spec.rb @@ -2,7 +2,7 @@ require_relative '../../../spec_helper' describe "Process::Status#exitstatus" do before :each do - ruby_exe("exit(42)") + ruby_exe("exit(42)", exit_status: 42) end it "returns the process exit code" do @@ -11,7 +11,7 @@ describe "Process::Status#exitstatus" do describe "for a child that raised SignalException" do before :each do - ruby_exe("Process.kill(:KILL, $$); exit(42)") + ruby_exe("Process.kill(:KILL, $$); exit(42)", exit_status: platform_is(:windows) ? 0 : nil) end platform_is_not :windows do diff --git a/spec/ruby/core/process/status/signaled_spec.rb b/spec/ruby/core/process/status/signaled_spec.rb index f23c95025f..389092a533 100644 --- a/spec/ruby/core/process/status/signaled_spec.rb +++ b/spec/ruby/core/process/status/signaled_spec.rb @@ -1,9 +1,7 @@ require_relative '../../../spec_helper' describe "Process::Status#signaled?" do - describe "for a cleanly exited child" do - before :each do ruby_exe("exit(0)") end @@ -14,9 +12,8 @@ describe "Process::Status#signaled?" do end describe "for a terminated child" do - before :each do - ruby_exe("Process.kill(:KILL, $$); exit(42)") + ruby_exe("Process.kill(:KILL, $$); exit(42)", exit_status: platform_is(:windows) ? 0 : nil) end platform_is_not :windows do @@ -30,6 +27,5 @@ describe "Process::Status#signaled?" do $?.signaled?.should be_false end end - end end diff --git a/spec/ruby/core/process/status/success_spec.rb b/spec/ruby/core/process/status/success_spec.rb index 28a1721800..c531121f08 100644 --- a/spec/ruby/core/process/status/success_spec.rb +++ b/spec/ruby/core/process/status/success_spec.rb @@ -1,9 +1,7 @@ require_relative '../../../spec_helper' describe "Process::Status#success?" do - describe "for a child that exited normally" do - before :each do ruby_exe("exit(0)") end @@ -14,9 +12,8 @@ describe "Process::Status#success?" do end describe "for a child that exited with a non zero status" do - before :each do - ruby_exe("exit(42)") + ruby_exe("exit(42)", exit_status: 42) end it "returns false" do @@ -25,27 +22,20 @@ describe "Process::Status#success?" do end describe "for a child that was terminated" do - before :each do - ruby_exe("Process.kill(:KILL, $$); exit(42)") + ruby_exe("Process.kill(:KILL, $$); exit(42)", exit_status: platform_is(:windows) ? 0 : nil) end platform_is_not :windows do - it "returns nil" do $?.success?.should be_nil end - end platform_is :windows do - it "always returns true" do $?.success?.should be_true end - end - end - end diff --git a/spec/ruby/core/process/status/termsig_spec.rb b/spec/ruby/core/process/status/termsig_spec.rb index 204708bc1b..1c87a6f455 100644 --- a/spec/ruby/core/process/status/termsig_spec.rb +++ b/spec/ruby/core/process/status/termsig_spec.rb @@ -13,7 +13,7 @@ describe "Process::Status#termsig" do describe "for a child that raised SignalException" do before :each do - ruby_exe("raise SignalException, 'SIGTERM'") + ruby_exe("raise SignalException, 'SIGTERM'", exit_status: nil) end platform_is_not :windows do @@ -25,7 +25,7 @@ describe "Process::Status#termsig" do describe "for a child that was sent a signal" do before :each do - ruby_exe("Process.kill(:KILL, $$); exit(42)") + ruby_exe("Process.kill(:KILL, $$); exit(42)", exit_status: platform_is(:windows) ? 0 : nil) end platform_is_not :windows do diff --git a/spec/ruby/core/process/status/to_i_spec.rb b/spec/ruby/core/process/status/to_i_spec.rb index a284f64f86..7cde9b915b 100644 --- a/spec/ruby/core/process/status/to_i_spec.rb +++ b/spec/ruby/core/process/status/to_i_spec.rb @@ -2,12 +2,12 @@ require_relative '../../../spec_helper' describe "Process::Status#to_i" do it "returns an integer when the child exits" do - ruby_exe('exit 48') + ruby_exe('exit 48', exit_status: 48) $?.to_i.should be_an_instance_of(Integer) end it "returns an integer when the child is signaled" do - ruby_exe('raise SignalException, "TERM"') + ruby_exe('raise SignalException, "TERM"', exit_status: platform_is(:windows) ? 3 : nil) $?.to_i.should be_an_instance_of(Integer) end end |