1 files changed, 20 insertions, 0 deletions
diff --git a/spec/ruby/shared/process/exit.rb b/spec/ruby/shared/process/exit.rb
index 1820dd17fd..e633afc73a 100644
--- a/spec/ruby/shared/process/exit.rb
+++ b/spec/ruby/shared/process/exit.rb
@@ -91,4 +91,24 @@ describe :process_exit!, shared: true do
     out.should == ""
     $?.exitstatus.should == 21
   end
+
+  it "skips at_exit handlers" do
+    out = ruby_exe("at_exit { STDERR.puts 'at_exit' }; #{@object}.send(:exit!, 21)", args: '2>&1')
+    out.should == ""
+    $?.exitstatus.should == 21
+  end
+
+  it "overrides the original exception and exit status when called from #at_exit" do
+    code = <<-RUBY
+    at_exit do
+      STDERR.puts 'in at_exit'
+      STDERR.puts "$! is \#{$!.class}:\#{$!.message}"
+      #{@object}.send(:exit!, 21)
+    end
+    raise 'original error'
+    RUBY
+    out = ruby_exe(code, args: '2>&1')
+    out.should == "in at_exit\n$! is RuntimeError:original error\n"
+    $?.exitstatus.should == 21
+  end
 end