ci-queue 0.20.5 → 0.20.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b3b09a46db2e51a46c56d7621c04519733ae879c654fb1f40b501ee83ccc18e
-  data.tar.gz: ce5611bebdb7d779a4d4cc9ed5c647445b1f1e11f684739e50d723dc62c9b724
+  metadata.gz: ce180525dfe099a326292c007d5654789406e1a4af4ed74455ea036891fd5e3b
+  data.tar.gz: 570f697ebc2d320e3a556b0b7323d8a2cc9920e3263e07ebef8fa2fc3517500e
 SHA512:
-  metadata.gz: 9ae21355372fd174e00228a23c52ac09dafd7660f0931178602e96ae1b0c38f50d7a931f16781190e8de90b5fcc26715b518c87ff94d75923e26b736eeca6b8a
-  data.tar.gz: 302a5dc245808eda350733554e87b176e9e5b949a041c09adf3da3dfb119d1cac9e4af7301952aeebc96280c896bb6bb4f7abfc48cf83739cb970a1eaa8d4189
+  metadata.gz: abe9a5431c9e61435f8f93ede21eae622c000b27d2359d24171e3e0bc10562d6b9c87f10138ccbd3d12e149aec09601ba2007510e1e629b1564df43a05675ce2
+  data.tar.gz: d504aa4e467eba720a2aaa35bb448dbbf13d52502d6e16a491afcfbfa8413face59eefc5b260c5412889b3d7dc0e65c194569e676e6f656147a163e67f622394

data/lib/ci/queue/configuration.rb

@@ -8,6 +8,7 @@ module CI
       attr_accessor :max_test_failed
       attr_reader :circuit_breakers
       attr_writer :seed, :build_id
+      attr_writer :queue_init_timeout
 
       class << self
         def from_env(env)
@@ -32,7 +33,8 @@ module CI
         timeout: 30, build_id: nil, worker_id: nil, max_requeues: 0, requeue_tolerance: 0,
         namespace: nil, seed: nil, flaky_tests: [], statsd_endpoint: nil, max_consecutive_failures: nil,
         grind_count: nil, max_duration: nil, failure_file: nil, max_test_duration: nil,
-        max_test_duration_percentile: 0.5, track_test_duration: false, max_test_failed: nil
+        max_test_duration_percentile: 0.5, track_test_duration: false, max_test_failed: nil,
+        queue_init_timeout: nil
       )
         @build_id = build_id
         @circuit_breakers = [CircuitBreaker::Disabled]
@@ -48,12 +50,17 @@ module CI
         @seed = seed
         @statsd_endpoint = statsd_endpoint
         @timeout = timeout
+        @queue_init_timeout = queue_init_timeout
         @track_test_duration = track_test_duration
         @worker_id = worker_id
         self.max_consecutive_failures = max_consecutive_failures
         self.max_duration = max_duration
       end
 
+      def queue_init_timeout
+        @queue_init_timeout || timeout
+      end
+
       def max_consecutive_failures=(max)
         if max
           @circuit_breakers << CircuitBreaker::MaxConsecutiveFailures.new(max_consecutive_failures: max)

data/lib/ci/queue/redis/supervisor.rb

@@ -8,7 +8,7 @@ module CI
         end
 
         def total
-          wait_for_master(timeout: config.timeout)
+          wait_for_master(timeout: config.queue_init_timeout)
           redis.get(key('total')).to_i
         end
 
@@ -17,7 +17,7 @@ module CI
         end
 
         def wait_for_workers
-          return false unless wait_for_master(timeout: config.timeout)
+          wait_for_master(timeout: config.queue_init_timeout)
 
           yield if block_given?
 

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/junit_reporter.rb

@@ -7,6 +7,8 @@ require 'fileutils'
 module Minitest
   module Queue
     class JUnitReporter < Minitest::Reporters::BaseReporter
+      include ::CI::Queue::OutputHelpers
+
       def initialize(report_path = 'log/junit.xml', options = {})
         super({})
         @report_path = File.absolute_path(report_path)
@@ -76,6 +78,8 @@ module Minitest
 
           testcase = testsuite.add_element('testcase', attributes)
           add_xml_message_for(testcase, test) unless test.passed?
+        rescue REXML::ParseException, RuntimeError => error
+          step(red("Skipping adding '#{suite}##{test.name}' to JUnit report: #{error.message}"))
         end
       end
 

data/lib/minitest/queue/runner.rb

@@ -352,7 +352,7 @@ module Minitest
 
           help = <<~EOS
             Specify a timeout after which if a test haven't completed, it will be picked up by another worker.
-            It is very important to set this vlaue higher than the slowest test in the suite, otherwise performance will be impacted.
+            It is very important to set this value higher than the slowest test in the suite, otherwise performance will be impacted.
             Defaults to 30 seconds.
           EOS
           opts.separator ""
@@ -360,6 +360,15 @@ module Minitest
             queue_config.timeout = timeout
           end
 
+          help = <<~EOS
+            Specify a timeout to elect the leader and populate the queue.
+            Defaults to the value set for --timeout.
+          EOS
+          opts.separator ""
+          opts.on('--queue-init-timeout TIMEOUT', Float, help) do |timeout|
+            queue_config.queue_init_timeout = timeout
+          end
+
           help = <<~EOS
             Specify $LOAD_PATH directory, similar to Ruby's -I
           EOS

data/lib/minitest/queue/test_data.rb

@@ -54,7 +54,11 @@ module Minitest
 
       def test_file_path
         path = @test.source_location.first
-        relative_path_for(path)
+        begin
+          relative_path_for(path)
+        rescue ArgumentError
+          path # e.g. "(eval)" etc.
+        end
       end
 
       def test_file_line_number
@@ -78,7 +82,11 @@ module Minitest
         return nil unless @test.failure
 
         path = error_location(@test.failure).first
-        relative_path_for(path)
+        begin
+          relative_path_for(path)
+        rescue ArgumentError
+          path # e.g. "(eval)" etc.
+        end
       end
 
       def error_file_number

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.20.5
+  version: 0.20.9
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-10 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -238,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.20
 signing_key: 
 specification_version: 4
 summary: Distribute tests over many workers using a queue