Merge pull request #9004 from MikeMcQuaid/fix-timeout-exit-retry

spec_helper: fix Timeout::Error/SystemExit handling.

Library/Homebrew/test/spec_helper.rb

@@ -189,20 +189,15 @@ RSpec.configure do |config|
       end
 
       begin
-        timeout = example.metadata.fetch(:timeout, 120)
+        timeout = example.metadata.fetch(:timeout, 60)
-        inner_timeout = nil
         Timeout.timeout(timeout) do
           example.run
-        rescue Timeout::Error => e
-          inner_timeout = e
         end
-      rescue Timeout::Error
+      rescue Timeout::Error => e
-        raise "Example exceeded maximum runtime of #{timeout} seconds."
+        example.example.set_exception(e)
       end
-
-      raise inner_timeout if inner_timeout
     rescue SystemExit => e
-      raise "Unexpected exit with status #{e.status}."
+      example.example.set_exception(e)
     ensure
       ENV.replace(@__env)