minitest-retry 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8d4d665c0afb4fe2ae9548c66ef1a7beb4158615b0d0f8e9ae193124b6c3c50
-  data.tar.gz: b475f7d149b3d6365ae8718884ea830cdf561a0c09e1e4b01eee5e82bb23c71d
+  metadata.gz: ef15ab34a100700a8fd0c7245ff9ebce03f33336dc967b717d615beaf1d885da
+  data.tar.gz: 6fec7805359af593b968e70afe3c755c9fed61b4e92290dcdcfa12feb0e11da5
 SHA512:
-  metadata.gz: 282ba68c650f2062afcd0acf9ac0fffab2c2fc5eed52744e24f87495edc8ea8624825e3bbb8e6d3869512481ed1932874af1ddb1cb5c0b7c0458393965014ebf
-  data.tar.gz: 87a04ad51d02b17181ca6c40b38c25c604de260222358a6ffcfba9d2757e4d3843939d140179e8825c28a4c1f4809cbceec381e8f5d4d8449d5fe48ef3cf9a0a
+  metadata.gz: d17edb63d1bc7171b701b502fa44c88b00c2f4a7c1a7bd03c312a0ba1ca679d1db558e91209fcde13f19f2d9f9323cac1346f470731855e2980ae65c51cbe55d
+  data.tar.gz: cdbe3f5e4e7061a5c68972f45a537764e46b410b815925e3a606b40939927044a69cc45499d1e8f5d73d333d8284600678b382e2a0dd652fc6b4c716dfaf739b

data/.github/workflows/ubuntu.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '3.4', '3.3', '3.2', '3.1', '3.0', '2.7', '2.6', '2.5', '2.4', '2.3' ]
+        ruby: [ '4.0', '3.4', '3.3', '3.2', '3.1', '3.0', '2.7', '2.6', '2.5', '2.4', '2.3' ]
     env:
       BUNDLE_GEMFILE: gemfiles/minitest_5.gemfile
     steps:
@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '3.4', '3.3', '3.2' ]
+        ruby: [ '4.0', '3.4', '3.3', '3.2' ]
     env:
       BUNDLE_GEMFILE: gemfiles/minitest_6.gemfile
     steps:

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+## 0.3.1
+
+* Fix a bug where tests were not retried during parallel execution with minitest 6#54 [y-yagi]
+
 ## 0.3.0
 
-* Support minitest 6 [y-yagi]
+* Support minitest v6 #50 [y-yagi]
 
 ## 0.2.5
 

data/lib/minitest/retry/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Retry
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/lib/minitest/retry.rb

@@ -7,6 +7,7 @@ module Minitest
         @retry_count, @io, @verbose, @exceptions_to_retry, @methods_to_retry, @classes_to_retry, @methods_to_skip, @exceptions_to_skip = retry_count, io, verbose, exceptions_to_retry, methods_to_retry, classes_to_retry, methods_to_skip, exceptions_to_skip
         @failure_callback, @consistent_failure_callback, @retry_callback = nil, nil, nil
         Minitest.prepend(self)
+        Minitest::Test.prepend(TestWithRetry) if Minitest::VERSION > "6"
       end
 
       def on_failure(&block)
@@ -94,7 +95,8 @@ module Minitest
         return classes_to_retry.any? { |class_to_retry| ancestors.include?(class_to_retry) }
       end
 
-      def run_with_retry(klass, method_name)
+      def run_with_retry(klass_or_instance, method_name)
+        klass = klass_or_instance.instance_of?(Class) ? klass_or_instance : klass_or_instance.class
         klass_method_name = "#{klass.name}##{method_name}"
         result = yield
 
@@ -112,6 +114,8 @@ module Minitest
             io.puts(msg)
           end
 
+          # NOTE: Only keep the last result when executed multiple times.
+          klass_or_instance.failures.clear if klass_or_instance.respond_to?(:failures)
           result = yield
           break if result.failures.empty?
         end
@@ -132,22 +136,17 @@ module Minitest
       end
     end
 
-    module RunnableMethods
-      def run(klass, method_name, reporter)
-        reporter.prerecord klass, method_name
-        result = Minitest::Retry.run_with_retry(klass, method_name) do
-          klass.new(method_name).run
+    module TestWithRetry
+      def run
+        result = Minitest::Retry.run_with_retry(self, self.name) do
+          super
         end
-        reporter.record result
+        result
       end
     end
 
     def self.prepended(base)
-      if Minitest::VERSION > "6"
-        class << Minitest::Runnable
-          prepend RunnableMethods
-        end
-      else
+      unless Minitest::VERSION > "6"
         class << base
           prepend ClassMethods
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-retry
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Yuji Yaginuma