ci-queue 0.20.6 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdf8ce628f8d7b21a66f614c867dbd2f568b011f22a467a6d274c51e81294a63
-  data.tar.gz: c591e50cf510e91d6aa6d6bbf39573b38581002c2dcf2e07f1b57e9edb2abef6
+  metadata.gz: a9a1d5f8211c29b9993d6ef94acff329a040d7e940b28e8d51eedc01e87c106b
+  data.tar.gz: d584ef67d1f2036b4c8b7880099515ff2a4f0618c2813e9caee099cfe11e587f
 SHA512:
-  metadata.gz: 9b5b2c9fe39aa132bda26cc98387349eaddcfb2074e37ed225f675a3e8fb3c50f42dab761f0620b54d1df48ae285b10d75f1b66f07456e05d4bccbfb01116414
-  data.tar.gz: f92b07076fc21b13efe3a9587f4e57cf7d1d12b1838c37d10fcbeb8b2e4e684a101fd5d9588fa482e06cf45c0e12f1bce212b5d7e9bcf695e4ba8f5fcfdd7864
+  metadata.gz: 88ddaa2717da8b9a989fa6d7bf859d509c29d2cf19ade4fcab882f6dfe4b33e1969c5f89121f3b5dfb1439b03e89e41227cf9f9f8e33d7e9295e43c7a2cb8e51
+  data.tar.gz: e7f5753cd1bdfd0f7500ebe00be9e7caf3a342ae931b974971bc95aa8ab27e86744211036a4fe70420a80d374235e1eb1ea6ce6eee4e14da52560502f1c26413

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/redis/worker.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'ci/queue/static'
+require 'set'
 
 module CI
   module Queue

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.20.6'
+    VERSION = '0.21.0'
     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

@@ -52,6 +52,14 @@ module Minitest
         @test.time
       end
 
+      def test_start_timestamp
+        @test.start_timestamp
+      end
+
+      def test_finish_timestamp
+        @test.finish_timestamp
+      end
+
       def test_file_path
         path = @test.source_location.first
         begin
@@ -82,7 +90,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
@@ -103,6 +115,8 @@ module Minitest
           test_retried: test_retried,
           test_assertions: test_assertions,
           test_duration: test_duration,
+          test_start_timestamp: test_start_timestamp,
+          test_finish_timestamp: test_finish_timestamp,
           test_file_path: test_file_path,
           test_file_line_number: test_file_line_number,
           error_class: error_class,

data/lib/minitest/queue.rb

@@ -102,6 +102,10 @@ module Minitest
     end
   end
 
+  module WithTimestamps
+    attr_accessor :start_timestamp, :finish_timestamp
+  end
+
   module Queue
     attr_writer :run_command_formatter, :project_root
 
@@ -159,13 +163,30 @@ module Minitest
         id <=> other.id
       end
 
+      def with_timestamps
+        start_timestamp = current_timestamp
+        result = yield
+        result
+      ensure
+        result.start_timestamp = start_timestamp
+        result.finish_timestamp = current_timestamp
+      end
+
       def run
-        Minitest.run_one_method(@runnable, @method_name)
+        with_timestamps do
+          Minitest.run_one_method(@runnable, @method_name)
+        end
       end
 
       def flaky?
         Minitest.queue.flaky?(self)
       end
+
+      private
+
+      def current_timestamp
+        Time.now.to_i
+      end
     end
 
     attr_reader :queue
@@ -244,9 +265,11 @@ MiniTest.singleton_class.prepend(MiniTest::Queue)
 if defined? MiniTest::Result
   MiniTest::Result.prepend(MiniTest::Requeueing)
   MiniTest::Result.prepend(MiniTest::Flakiness)
+  MiniTest::Result.prepend(MiniTest::WithTimestamps)
 else
   MiniTest::Test.prepend(MiniTest::Requeueing)
   MiniTest::Test.prepend(MiniTest::Flakiness)
+  MiniTest::Test.prepend(MiniTest::WithTimestamps)
 
   module MinitestBackwardCompatibility
     def source_location

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.20.6
+  version: 0.21.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2021-09-20 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