Merge pull request #740 from johnnyshields/backport-jruby-fix

Backport JRuby test fix to master

test/test_helper.rb

@@ -385,15 +385,14 @@ def downcased_escape(str)
 # Remove after https://github.com/jruby/jruby/issues/6613 is fixed
 if Minitest::Test.jruby?
   module JRubyZlibTestExtension
-    @@jruby_zlib_failures = 0
-
-    def run
+    def capture_exceptions
       super
-    rescue Zlib::BufError => e
-      raise e unless (@@jruby_zlib_failures += 1) < 10
-      skip "Skipping Zlib::BufError in JRuby, see https://github.com/jruby/jruby/issues/6613"
+
+      if failures && failures.reject! { |e| e.error && e.error.is_a?(Zlib::BufError) } # nil if nothing rejected
+        failures << Minitest::Skip.new('Skipping Zlib::BufError in JRuby. See: https://github.com/jruby/jruby/issues/6613')
+      end
     end
   end
 
   Minitest::Test.prepend(JRubyZlibTestExtension)
-end
+end