minitest-distributed 0.2.13 → 0.3.0

data/lib/minitest/distributed/enqueued_runnable.rb

@@ -85,6 +85,7 @@ module Minitest
         const :enqueued_runnable, EnqueuedRunnable
         const :initial_result, Minitest::Result
         const :commit, Commit
+        const :force_discard, T::Boolean, default: false
 
         sig { returns(String) }
         def entry_id
@@ -104,7 +105,7 @@ module Minitest
         sig { returns(Minitest::Result) }
         def committed_result
           @committed_result ||= T.let(
-            if final? && commit.failure?
+            if force_discard || (final? && commit.failure?)
               # If a runnable result is final, but the acked failed, we will discard the result.
               Minitest::Discard.wrap(
                 initial_result,

data/lib/minitest/distributed/reporters/distributed_summary_reporter.rb

@@ -22,12 +22,44 @@ module Minitest
 
         sig { override.void }
         def report
-          print_discard_warning if local_results.discards > 0
+          print_discard_warning if local_results.discards > 0 && !current_attempt_truncated? && !superseded?
 
-          if configuration.coordinator.aborted?
+          if superseded?
+            print_local_results("This worker was superseded; its local results do not affect the authoritative run.")
+            return
+          elsif registration_rejected?
+            print_local_results("Combined results are unavailable because coordinator registration was rejected.")
+            return
+          elsif truncation_state_invalid?
+            print_local_results("Combined results are unavailable because the retained truncation state is incomplete.")
+            return
+          elsif coordinator_stalled?
+            print_local_results("Combined results are unavailable because the Redis coordinator state is invalid.")
+            return
+          elsif retry_refused_due_to_truncation?
             io.puts("Cannot retry a run that was cut short during the previous attempt.")
-            io.puts
-          elsif combined_results.abort?
+            print_local_results("Combined results were not read for this rejected retry.")
+            return
+          elsif current_attempt_truncated?
+            io.puts("The run was cut short after another worker reached the max-failures limit.")
+            print_local_results("Combined results were not read after truncation.")
+            return
+          elsif configuration.coordinator.aborted?
+            print_local_results("Combined results are unavailable because the coordinator aborted this worker.")
+            return
+          end
+
+          persisted_truncation = configuration.coordinator.persisted_truncation?
+          @combined_results = nil
+          unless configuration.coordinator.valid_combined_results?
+            if persisted_truncation
+              io.puts("The run was cut short after reaching the limit of #{configuration.max_failures} test failures.")
+            end
+            print_local_results("Combined results are unavailable because terminal coordinator state is invalid.")
+            return
+          end
+
+          if persisted_truncation
             io.puts("The run was cut short after reaching the limit of #{configuration.max_failures} test failures.")
             io.puts
           end
@@ -43,6 +75,7 @@ module Minitest
 
         sig { override.returns(T::Boolean) }
         def passed?
+          return true if superseded?
           return false if configuration.coordinator.aborted?
 
           # Generally, we want the workers to fail that had at least one failed or errored
@@ -50,11 +83,18 @@ module Minitest
           # encountered a failed test. We trust that the other worker will do this correctly,
           # but we do verify that the statistics for the complete run are valid,
           # to have some protection against unknown edge cases and bugs.
-          local_results.passed? && combined_results.valid?
+          local_results.passed? && configuration.coordinator.valid_combined_results?
         end
 
         protected
 
+        sig { params(message: String).void }
+        def print_local_results(message)
+          formatted_duration = format("(in %0.3fs)", Minitest.clock_time - @start_time)
+          io.puts("This worker: #{local_results} #{formatted_duration}")
+          io.puts(message)
+        end
+
         sig { void }
         def print_discard_warning
           io.puts(<<~WARNING)
@@ -65,6 +105,42 @@ module Minitest
           WARNING
         end
 
+        sig { returns(T::Boolean) }
+        def superseded?
+          coordinator = T.unsafe(configuration.coordinator)
+          coordinator.respond_to?(:superseded?) && !!coordinator.superseded?
+        end
+
+        sig { returns(T::Boolean) }
+        def registration_rejected?
+          coordinator = T.unsafe(configuration.coordinator)
+          coordinator.respond_to?(:registration_rejected?) && !!coordinator.registration_rejected?
+        end
+
+        sig { returns(T::Boolean) }
+        def truncation_state_invalid?
+          coordinator = T.unsafe(configuration.coordinator)
+          coordinator.respond_to?(:truncation_state_invalid?) && !!coordinator.truncation_state_invalid?
+        end
+
+        sig { returns(T::Boolean) }
+        def retry_refused_due_to_truncation?
+          coordinator = T.unsafe(configuration.coordinator)
+          coordinator.respond_to?(:retry_refused_due_to_truncation?) && !!coordinator.retry_refused_due_to_truncation?
+        end
+
+        sig { returns(T::Boolean) }
+        def current_attempt_truncated?
+          coordinator = T.unsafe(configuration.coordinator)
+          coordinator.respond_to?(:current_attempt_truncated?) && !!coordinator.current_attempt_truncated?
+        end
+
+        sig { returns(T::Boolean) }
+        def coordinator_stalled?
+          coordinator = T.unsafe(configuration.coordinator)
+          coordinator.respond_to?(:stalled?) && !!coordinator.stalled?
+        end
+
         sig { returns(ResultAggregate) }
         def local_results
           @local_results ||= T.let(configuration.coordinator.local_results, T.nilable(ResultAggregate))

data/lib/minitest/distributed/version.rb

@@ -3,6 +3,6 @@
 
 module Minitest
   module Distributed
-    VERSION = "0.2.13"
+    VERSION = "0.3.0"
   end
 end

data/sorbet/config

@@ -1,3 +1,5 @@
 --dir
 .
 --ignore=vendor
+--typed-override
+sorbet/typed_overrides.yaml

data/sorbet/rbi/minitest.rbi

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: true
 
 module Minitest
   class Runnable
@@ -171,7 +171,7 @@ module Minitest::Assertions
 
   sig do
     params(
-      collection: T::Enumerable[T.untyped],
+      collection: T.untyped,
       obj: BasicObject,
       msg: T.nilable(String)
     ).returns(TrueClass)
@@ -188,10 +188,11 @@ module Minitest::Assertions
 
   sig do
     params(
-      exp: T.untyped
+      exp: T.untyped,
+      blk: T.untyped
     ).returns(TrueClass)
   end
-  def assert_raises(*exp); end
+  def assert_raises(*exp, &blk); end
 
   sig do
     params(

data/sorbet/rbi/shims/prism.rbi

@@ -0,0 +1,13 @@
+# typed: true
+# frozen_string_literal: true
+
+# Shim for prism 1.9.0's bundled RBI, which references `Prism::LexCompat::Result`
+# in a sig at rbi/prism.rbi:16. `LexCompat` was renamed to `LexResult` upstream
+# but the sig wasn't updated, so Sorbet errors with 5002 (Unable to resolve
+# constant `LexCompat`). Defining the namespace here makes the sig resolve
+# without globally suppressing 5002 — keeping 5002 active for our own code.
+module Prism
+  class LexCompat
+    class Result; end
+  end
+end

data/sorbet/typed_overrides.yaml

@@ -0,0 +1,21 @@
+# Force autogenerated gem RBIs to `# typed: false` via --typed-override
+# (sorbet/config). Editing the sigil in the files themselves would be
+# wiped by `srb rbi gems`.
+false:
+  - './sorbet/rbi/gems/ast.rbi'
+  - './sorbet/rbi/gems/connection_pool.rbi'
+  - './sorbet/rbi/gems/minitest-distributed.rbi'
+  - './sorbet/rbi/gems/minitest.rbi'
+  - './sorbet/rbi/gems/parallel.rbi'
+  - './sorbet/rbi/gems/parser.rbi'
+  - './sorbet/rbi/gems/rainbow.rbi'
+  - './sorbet/rbi/gems/redis-client.rbi'
+  - './sorbet/rbi/gems/redis.rbi'
+  - './sorbet/rbi/gems/rexml.rbi'
+  - './sorbet/rbi/gems/rubocop-ast.rbi'
+  - './sorbet/rbi/gems/rubocop-minitest.rbi'
+  - './sorbet/rbi/gems/rubocop-rake.rbi'
+  - './sorbet/rbi/gems/rubocop-sorbet.rbi'
+  - './sorbet/rbi/gems/ruby-progressbar.rbi'
+  - './sorbet/rbi/gems/toxiproxy.rbi'
+  - './sorbet/rbi/gems/unicode-display_width.rbi'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-distributed
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.3.0
 platform: ruby
 authors:
 - Willem van Bergen
@@ -161,7 +161,9 @@ files:
 - sorbet/rbi/minitest.rbi
 - sorbet/rbi/rails.rbi
 - sorbet/rbi/rbconfig.rbi
+- sorbet/rbi/shims/prism.rbi
 - sorbet/rbi/winsize.rbi
+- sorbet/typed_overrides.yaml
 homepage: https://github.com/Shopify/minitest-distributed
 licenses:
 - MIT
@@ -183,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.12
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Distributed test executor plugin for Minitest
 test_files: []