ci-queue 0.101.0 → 0.103.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 612d0f2f3077fdd5b7e74b343649a162101c2961c8b4cda8329ca10fbd831e6b
-  data.tar.gz: bdd01c95971bcbfab5999b3754f8d019be35a7202e5f766d5df19191462e5563
+  metadata.gz: 1a24e0e7c59b26262d59f97421542552b81673905d038ee4837fc44089d8afa5
+  data.tar.gz: 4cd6ce3732169a49fa31827b78c34b65cf1ade9d5b4fd34cc482e5ea58b5a62e
 SHA512:
-  metadata.gz: 69a03983e12372fe0ab0258ec08262b2672624d49d2d63a0c35d0a89b4c8c85b3fd89ece2ce3c71de112652cd327868ee0fa7633ae283facb3b0bf57035d5724
-  data.tar.gz: 44ead0bb47b690b19652982496f8a48d698f5bb78ea4f88c01e56b7774d4c79f6b6015b50e91cb70e241fc00a13bf842a72828792c7f716644cacf12bfb8bb2d
+  metadata.gz: de7c8c8424d801685d67a7ea723edff6269f52e6d57a54f48d88cbaccb394d2ce53e84a2434b36852f635396b1241f25c9bb15b4199f13bf4c25c9b680cabd8f
+  data.tar.gz: 58d984a94ce049dccaf0ccb48b6602f208dc4e0bff39a3502b9b83010450c2443fdfeaebbd33ceb332c75594f6243fbde98c75f63d1a36551e44347e2b790a9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.101.0)
+    ci-queue (0.103.0)
       logger
 
 GEM

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.101.0'
+    VERSION = '0.103.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/runner.rb

@@ -103,6 +103,7 @@ module Minitest
         trap('TERM') { Minitest.queue.shutdown! }
         trap('INT') { Minitest.queue.shutdown! }
 
+        queue_prepared = false
         if queue.rescue_connection_errors { queue.exhausted? }
           puts green('All tests were ran already')
         else
@@ -117,9 +118,11 @@ module Minitest
               puts green("Queue almost empty, exiting early...")
             else
               prepare_queue_for_execution
+              queue_prepared = true
             end
           else
             prepare_queue_for_execution
+            queue_prepared = true
           end
         end
 
@@ -132,8 +135,13 @@ module Minitest
           # Re-check exhausted? after booting: slow workers may arrive after the queue
           # has been fully drained by faster workers. In that case exit cleanly (0)
           # rather than letting Minitest return false for a 0-test run.
-          if queue.rescue_connection_errors { queue.exhausted? }
-            puts green('All tests were ran already')
+          #
+          # Also exit when the queue wasn't prepared above, because it was exhausted
+          # or a retried worker found it almost empty. No tests were loaded and the
+          # queue can't resolve entries, so the first test this worker reserved would
+          # crash it.
+          if !queue_prepared || queue.rescue_connection_errors { queue.exhausted? }
+            puts green('All tests were ran already') if queue_prepared
             verify_reporters!(reporters)
             exit!(0)
           end
@@ -304,7 +312,11 @@ module Minitest
         step("Waiting for workers to complete")
 
         unless supervisor.wait_for_workers { display_warnings(supervisor.build) }
-          unless supervisor.queue_initialized?
+          # A lazy-load leader only marks the queue as initialized once it has
+          # streamed every test, but workers start on the first batch, so the wait
+          # can end (e.g. on --max-test-failed) while it is still streaming.
+          # Check streaming? first: the status only moves from streaming to ready.
+          unless supervisor.streaming? || supervisor.queue_initialized?
             abort! "No leader was elected. This typically means no worker was able to start. Were there any errors during application boot?", 40
           end
 
@@ -314,7 +326,7 @@ module Minitest
             reporter.write_failure_file(queue_config.failure_file) if queue_config.failure_file
             reporter.write_flaky_tests_file(queue_config.export_flaky_tests_file) if queue_config.export_flaky_tests_file
 
-            abort!("#{supervisor.size} tests weren't run.", exit_code)
+            abort!(unrun_tests_message(supervisor), exit_code)
           end
         end
 
@@ -447,6 +459,16 @@ module Minitest
         Minitest::Queue::WorkerProfileReporter.new(supervisor).print_summary
       end
 
+      def unrun_tests_message(supervisor)
+        # Read the status before the size: tests a streaming leader hasn't pushed
+        # yet aren't in the queue, so the size is only a lower bound.
+        if supervisor.streaming?
+          "At least #{supervisor.size} tests weren't run (the leader hadn't finished streaming tests to the queue)."
+        else
+          "#{supervisor.size} tests weren't run."
+        end
+      end
+
       def parser
         @parser ||= OptionParser.new do |opts|
           opts.banner = "Usage: minitest-queue [options] COMMAND [ARGS]"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.101.0
+  version: 0.103.0
 platform: ruby
 authors:
 - Jean Boussier
@@ -319,7 +319,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.21
+rubygems_version: 4.0.22
 specification_version: 4
 summary: Distribute tests over many workers using a queue
 test_files: []