minitest-retry 0.2.5 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d8360dd61c3f71e79586334e48d4eea9faaaf7a9c796b20c299615f9b6a38e9
-  data.tar.gz: 553974451059c548716c961245ee9698a18d9720db28a37d60ddf8def070e0dd
+  metadata.gz: ef15ab34a100700a8fd0c7245ff9ebce03f33336dc967b717d615beaf1d885da
+  data.tar.gz: 6fec7805359af593b968e70afe3c755c9fed61b4e92290dcdcfa12feb0e11da5
 SHA512:
-  metadata.gz: e414e49f1c49c41c615ffea9c5950a2900c5036d2dfcd505a634d333544ef8f37c33318e6b12963abc2e0c5d0fc77635d59483f00a28b2ca6d14fd7a1bc786be
-  data.tar.gz: 0e39b05be22d6d7c2768a02dbce7c705b9dfc7cacdcdd5545bb023aa5bf76ed74a757954ab3634e84bbd2332852af9f9ff4eac0d9923ea05ad4543fe1be01f84
+  metadata.gz: d17edb63d1bc7171b701b502fa44c88b00c2f4a7c1a7bd03c312a0ba1ca679d1db558e91209fcde13f19f2d9f9323cac1346f470731855e2980ae65c51cbe55d
+  data.tar.gz: cdbe3f5e4e7061a5c68972f45a537764e46b410b815925e3a606b40939927044a69cc45499d1e8f5d73d333d8284600678b382e2a0dd652fc6b4c716dfaf739b

data/.github/workflows/push_gem.yml

@@ -0,0 +1,33 @@
+name: Push Gem
+
+on:
+  push:
+    tags:
+      - v*
+
+permissions:
+  contents: read
+
+jobs:
+  push:
+    if: github.repository == 'y-yagi/minitest-retry'
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      id-token: write
+
+    steps:
+      - name: Harden Runner
+        uses: step-security/harden-runner@4d991eb9b905ef189e4c376166672c3f2f230481 # v2.11.0
+        with:
+          egress-policy: audit
+
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@2e007403fc1ec238429ecaa57af6f22f019cc135 # v1.234.0
+        with:
+          bundler-cache: true
+          ruby-version: ruby
+
+      - uses: rubygems/release-gem@9e85cb11501bebc2ae661c1500176316d3987059 # v1.1.0

data/.github/workflows/stale.yml

@@ -18,7 +18,7 @@ jobs:
       pull-requests: write
 
     steps:
-    - uses: actions/stale@v9
+    - uses: actions/stale@5bef64f19d7facfb25b37b414482c7164d639639 # v9.1.0
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
         stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'

data/.github/workflows/ubuntu.yml

@@ -3,18 +3,36 @@ name: CI
 on: [push]
 
 jobs:
-  build:
+  minitest-5:
     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:
-    - uses: actions/checkout@v4
-    - uses: ruby/setup-ruby@v1
+    - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+    - uses: ruby/setup-ruby@a25f1e45f0e65a92fcb1e95e8847f78fb0a7197a # v1.273.0
       with:
         ruby-version: ${{ matrix.ruby }}
     - name: Install dependencies
-      run: |
-        bundle install
+      run: bundle install
+    - name: Run test
+      run: bundle exec rake
+
+  minitest-6:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '4.0', '3.4', '3.3', '3.2' ]
+    env:
+      BUNDLE_GEMFILE: gemfiles/minitest_6.gemfile
+    steps:
+    - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
+    - uses: ruby/setup-ruby@a25f1e45f0e65a92fcb1e95e8847f78fb0a7197a # v1.273.0
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: bundle install
     - name: Run test
       run: bundle exec rake

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/gemfiles/*.lock

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 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 v6 #50 [y-yagi]
+
 ## 0.2.5
 
 * Add `exceptions_to_skip` option #48 [y-yagi]

data/gemfiles/minitest_5.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+eval_gemfile File.expand_path("../Gemfile", __dir__)
+
+gem "minitest", "< 6"

data/gemfiles/minitest_6.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+eval_gemfile File.expand_path("../Gemfile", __dir__)
+
+gem "minitest", ">= 6", "< 7"

data/lib/minitest/retry/version.rb

@@ -1,5 +1,5 @@
 module Minitest
   module Retry
-    VERSION = "0.2.5"
+    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)
@@ -93,39 +94,62 @@ module Minitest
         ancestors = klass.ancestors.map(&:to_s)
         return classes_to_retry.any? { |class_to_retry| ancestors.include?(class_to_retry) }
       end
+
+      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
+
+        return result unless failure_to_retry?(result.failures, klass_method_name, klass)
+        return result if result.skipped?
+
+        failure_callback&.call(klass, method_name, result)
+
+        retry_count.times do |count|
+          retry_callback&.call(klass, method_name, count + 1, result)
+
+          if verbose && io
+            msg = "[MinitestRetry] retry '%s' count: %s,  msg: %s\n" %
+              [method_name, count + 1, result.failures.map(&:message).join(",")]
+            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
+
+        if consistent_failure_callback && !result.failures.empty?
+          consistent_failure_callback.call(klass, method_name, result)
+        end
+
+        result
+      end
     end
 
     module ClassMethods
       def run_one_method(klass, method_name)
-        result = super(klass, method_name)
-
-        klass_method_name = "#{klass.name}##{method_name}"
-        return result unless Minitest::Retry.failure_to_retry?(result.failures, klass_method_name, klass)
-        if !result.skipped?
-          Minitest::Retry.failure_callback.call(klass, method_name, result) if Minitest::Retry.failure_callback
-          Minitest::Retry.retry_count.times do |count|
-            Minitest::Retry.retry_callback.call(klass, method_name, count + 1, result) if Minitest::Retry.retry_callback
-            if Minitest::Retry.verbose && Minitest::Retry.io
-              msg = "[MinitestRetry] retry '%s' count: %s,  msg: %s\n" %
-                [method_name, count + 1, result.failures.map(&:message).join(",")]
-              Minitest::Retry.io.puts(msg)
-            end
-
-            result = super(klass, method_name)
-            break if result.failures.empty?
-          end
+        Minitest::Retry.run_with_retry(klass, method_name) do
+          super(klass, method_name)
+        end
+      end
+    end
 
-          if Minitest::Retry.consistent_failure_callback && !result.failures.empty?
-            Minitest::Retry.consistent_failure_callback.call(klass, method_name, result)
-          end
+    module TestWithRetry
+      def run
+        result = Minitest::Retry.run_with_retry(self, self.name) do
+          super
         end
         result
       end
     end
 
     def self.prepended(base)
-      class << base
-        prepend ClassMethods
+      unless Minitest::VERSION > "6"
+        class << base
+          prepend ClassMethods
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: minitest-retry
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.1
 platform: ruby
 authors:
 - Yuji Yaginuma
 bindir: exe
 cert_chain: []
-date: 2025-01-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -58,6 +58,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/push_gem.yml"
 - ".github/workflows/stale.yml"
 - ".github/workflows/ubuntu.yml"
 - ".gitignore"
@@ -68,6 +69,8 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- gemfiles/minitest_5.gemfile
+- gemfiles/minitest_6.gemfile
 - lib/minitest/retry.rb
 - lib/minitest/retry/version.rb
 - minitest-retry.gemspec
@@ -91,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: re-run the test when the test fails
 test_files: []