ci-queue 0.93.0 → 0.94.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be6f03ad5e92846d3fc8439c3e7f0c5d8c7f5aff4d3c7fd18524ecf84c0e7965
-  data.tar.gz: f8a218457abece125c9670fe8462009fb3787b3df923b4ae0d4beb56e2dff80f
+  metadata.gz: 3c02125deb535c3692db00957a8684af3080464e2eb0433ce32a86d596068290
+  data.tar.gz: 609ffa08032a2603d305a2651b91a751beb25220fda483a64c5b29b4bd4b9b9e
 SHA512:
-  metadata.gz: e7192b7e8fb8fb41446b3569e21a5672e7cf36ca5cfd24a8443eb91b093e8cd6174a914cbfcf52580f33793a02a463381ab2cee5504425096b1435e5eb06ada1
-  data.tar.gz: 159a1525f2b3096ca7b32bb0da3353db324c58abe7275ad0c56de05e72c2939325f78e5aa699241dc226e01a932be8c893cd6864262ee78f84c20a71298ee476
+  metadata.gz: e543f22d017b64b9ff0c053e1095485de56900b67f3d81d3f5ee9271c1dd2534774362f5a275bc160aa5c88e9de9f4ba80770540d08b9e0fc017dd58dbfda55f
+  data.tar.gz: 6309ef7b55e0a627ddeb7415316dae9eb761bebc7d8bf7355d5a6239ac70a91e7558b991c27affc0484a4ccc0a50bb00be7b3d6c2fba9bee52d13fd0af8d9c8e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.93.0)
+    ci-queue (0.94.0)
       logger
 
 GEM
@@ -38,6 +38,7 @@ GEM
     lint_roller (1.1.0)
     logger (1.7.0)
     minitest (5.27.0)
+    minitest-mock (5.27.0)
     minitest-reporters (1.7.1)
       ansi
       builder
@@ -106,6 +107,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-23
+  arm64-darwin-24
   ruby
 
 DEPENDENCIES
@@ -113,7 +115,8 @@ DEPENDENCIES
   benchmark
   bundler
   ci-queue!
-  minitest (~> 5.11)
+  minitest (>= 5.11)
+  minitest-mock
   minitest-reporters (~> 1.1)
   mocha
   msgpack

data/ci-queue.gemspec

@@ -35,11 +35,12 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')
+  spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '>= 5.11')
   spec.add_development_dependency 'rspec', '~> 3.10'
   spec.add_development_dependency 'redis'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
+  spec.add_development_dependency 'minitest-mock'
   spec.add_development_dependency 'mocha'
 
   spec.add_development_dependency 'rexml'

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/runner.rb

@@ -393,6 +393,7 @@ module Minitest
         child_pid = fork do
           Minitest.queue = queue
           Minitest::Reporters.use!([Minitest::Reporters::BisectReporter.new])
+          Minitest.load_plugins if Minitest.respond_to?(:load_plugins)
           exit # let minitest excute its at_exit
         end
 

data/lib/minitest/queue.rb

@@ -359,7 +359,7 @@ module Minitest
 
       def run
         with_timestamps do
-          Minitest.run_one_method(@runnable, @method_name)
+          @runnable.new(@method_name).run
         end
       end
 
@@ -450,7 +450,7 @@ module Minitest
           elsif skip_stale_tests? && !(runnable.method_defined?(@method_name) || runnable.private_method_defined?(@method_name))
             build_stale_skip_result
           else
-            Minitest.run_one_method(runnable, @method_name)
+            runnable.new(@method_name).run
           end
         rescue StandardError, ScriptError => error
           build_error_result(error)
@@ -552,6 +552,12 @@ module Minitest
       Reporters.use!(((Reporters.reporters || []) - @queue_reporters) + reporters)
       Minitest.backtrace_filter.add_filter(%r{exe/minitest-queue|lib/ci/queue/})
       @queue_reporters = reporters
+
+      # minitest 6 made plugin loading opt-in (no longer called from
+      # Minitest.run). Ensure minitest-reporters' plugin is loaded so
+      # that its DelegateReporter wires our reporters into the
+      # CompositeReporter that Minitest.run creates.
+      Minitest.load_plugins if Minitest.respond_to?(:load_plugins)
     end
 
     def loaded_tests
@@ -562,19 +568,34 @@ module Minitest
       end
     end
 
-    def __run(*args)
-      if queue
-        Queue.run(*args)
+    # minitest 5 calls __run; minitest 6 renamed it to run_all_suites.
+    # Define both so the prepend intercepts whichever version is active.
+    %i[__run run_all_suites].each do |name|
+      define_method(name) do |*args|
+        if queue
+          Queue.run(*args)
 
-        if queue.config.circuit_breakers.any?(&:open?)
-          STDERR.puts queue.config.circuit_breakers.map(&:message).join(' ').strip
-        end
+          if queue.config.circuit_breakers.any?(&:open?)
+            STDERR.puts queue.config.circuit_breakers.map(&:message).join(' ').strip
+          end
+
+          if queue.max_test_failed?
+            STDERR.puts 'This worker is exiting early because too many failed tests were encountered.'
+          end
 
-        if queue.max_test_failed?
-          STDERR.puts 'This worker is exiting early because too many failed tests were encountered.'
+          # minitest 6 starts a Parallel::Executor thread pool before
+          # calling run_all_suites, then joins those threads in shutdown
+          # afterward. ci-queue bypasses the executor entirely (it has
+          # its own Redis poll loop), so the worker threads sit idle and
+          # shutdown hangs forever. Drain them here so the later
+          # shutdown in Minitest.run is a no-op.
+          if Minitest.respond_to?(:parallel_executor)
+            executor = Minitest.parallel_executor
+            executor.shutdown if executor.respond_to?(:shutdown)
+          end
+        else
+          super(*args)
         end
-      else
-        super
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.93.0
+  version: 0.94.0
 platform: ruby
 authors:
 - Jean Boussier
@@ -55,14 +55,14 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.11'
 - !ruby/object:Gem::Dependency
@@ -121,6 +121,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement