diff options
| author | Benoit Daloze <[email protected]> | 2021-03-27 13:02:41 +0100 |
|---|---|---|
| committer | Benoit Daloze <[email protected]> | 2021-03-27 13:02:41 +0100 |
| commit | 95d9fe9538441eb57ee6752aa1c5088fc6608e34 (patch) | |
| tree | 9a0bb070fd8042b83470f7a0bf9cd462c919c7c0 /spec/ruby/core/exception | |
| parent | 44736a6b7a2b3475db2d05187f33e3c1a7b4b4e5 (diff) | |
Update to ruby/spec@fd6eddd
Diffstat (limited to 'spec/ruby/core/exception')
| -rw-r--r-- | spec/ruby/core/exception/interrupt_spec.rb | 18 | ||||
| -rw-r--r-- | spec/ruby/core/exception/result_spec.rb | 8 |
2 files changed, 20 insertions, 6 deletions
diff --git a/spec/ruby/core/exception/interrupt_spec.rb b/spec/ruby/core/exception/interrupt_spec.rb index 14f294bec6..a7501efadc 100644 --- a/spec/ruby/core/exception/interrupt_spec.rb +++ b/spec/ruby/core/exception/interrupt_spec.rb @@ -29,7 +29,23 @@ describe "rescuing Interrupt" do sleep rescue Interrupt => e e.signo.should == Signal.list["INT"] - e.signm.should == "" + ["", "Interrupt"].should.include?(e.message) end end end + +describe "Interrupt" do + # This spec is basically the same as above, + # but it does not rely on Signal.trap(:INT, :SIG_DFL) which can be tricky + it "is raised on the main Thread by the default SIGINT handler" do + out = ruby_exe(<<-'RUBY', args: "2>&1") + begin + Process.kill :INT, Process.pid + sleep + rescue Interrupt => e + puts "Interrupt: #{e.signo}" + end + RUBY + out.should == "Interrupt: #{Signal.list["INT"]}\n" + end +end diff --git a/spec/ruby/core/exception/result_spec.rb b/spec/ruby/core/exception/result_spec.rb index 2f12673295..d42fcdffcb 100644 --- a/spec/ruby/core/exception/result_spec.rb +++ b/spec/ruby/core/exception/result_spec.rb @@ -14,10 +14,8 @@ describe "StopIteration#result" do it "returns the method-returned-object from an Enumerator" do @enum.next @enum.next - -> { @enum.next }.should( - raise_error(StopIteration) do |error| - error.result.should equal(:method_returned) - end - ) + -> { @enum.next }.should raise_error(StopIteration) { |error| + error.result.should equal(:method_returned) + } end end |