Merge pull request #6525 from freerange/minitest-passthrough-exceptions

Exceptions like Interrupt & NoMemoryError should not be rescued in tests.

1 files changed, 12 insertions, 0 deletions

diff --git a/activesupport/lib/active_support/testing/setup_and_teardown.rb b/activesupport/lib/active_support/testing/setup_and_teardown.rb
index 772c7b4209..527fa555b7 100644
--- a/activesupport/lib/active_support/testing/setup_and_teardown.rb
+++ b/activesupport/lib/active_support/testing/setup_and_teardown.rb
@@ -4,6 +4,14 @@ require 'active_support/callbacks'
 module ActiveSupport
   module Testing
     module SetupAndTeardown
+
+      PASSTHROUGH_EXCEPTIONS = [
+        NoMemoryError,
+        SignalException,
+        Interrupt,
+        SystemExit
+      ]
+
       extend ActiveSupport::Concern
 
       included do
@@ -28,11 +36,15 @@ module ActiveSupport
           run_callbacks :setup do
             result = super
           end
+        rescue *PASSTHROUGH_EXCEPTIONS
+          raise
         rescue Exception => e
           result = runner.puke(self.class, method_name, e)
         ensure
           begin
             run_callbacks :teardown
+          rescue *PASSTHROUGH_EXCEPTIONS
+            raise
           rescue Exception => e
             result = runner.puke(self.class, method_name, e)
           end