ci-queue 0.20.7 → 0.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 869f4269443defdf645936cf4b6cf969dd821263b9a96b4de71da7bbbbd98152
-  data.tar.gz: 3aa8a19f472ed869a88f35b3c124a01700fc1acf235617c5f78dcb67232f91c8
+  metadata.gz: bb09b44ca70cde6218873faed3b7067295088a115b2b33ddc93b3853ad318042
+  data.tar.gz: d0eb4a637fb89aa8c2858e5f1c363b86518cb310729d417fc6e7847c7bd261b8
 SHA512:
-  metadata.gz: 7d5cd85fe45b05060738a72f6be624e3cfef6bf9a24ea3019433773aa7bb8a7a6f5ef94dc6a0d2cce5a2d04d4b820ca242f41f07e8720aa2f004f528bc4de372
-  data.tar.gz: a82a023c73718e924210c2a379d6195b62062731679c24c6a230cff26df3d455107c1a902d8a9a97fd3a2a2510a6c145e8f02545121720139ad2e2802d37b3ae
+  metadata.gz: e3b35848df951df70cddc2bab778f5160dc0293f09cc66218b31567ce8b2fe7e7a020f5aeec9fb2b6890e53a175b70ada164b404306ee5582cc1a40601515643
+  data.tar.gz: 8f5ffdaaad075ddcc724117f3b2414f7a15b49509d0b0df5b4415827b6452efc251974398a58b2203c776fdb70819ab53c8042ce4d3add056b245ff8cafed179

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
@@ -15,7 +16,6 @@ module CI
         attr_reader :total
 
         def initialize(redis, config)
-          @last_warning = nil
           @reserved_test = nil
           @shutdown_required = false
           super(redis, config)
@@ -48,7 +48,7 @@ module CI
           wait_for_master
           until shutdown_required? || config.circuit_breakers.any?(&:open?) || exhausted? || max_test_failed?
             if test = reserve
-              yield index.fetch(test), @last_warning
+              yield index.fetch(test)
             else
               sleep 0.05
             end

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.20.7'
+    VERSION = '0.21.1'
     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/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,21 +163,36 @@ module Minitest
         id <=> other.id
       end
 
+      def with_timestamps
+        start_timestamp = current_timestamp
+        result = yield
+        result
+      ensure
+        if result
+          result.start_timestamp = start_timestamp
+          result.finish_timestamp = current_timestamp
+        end
+      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
-    end
 
-    attr_reader :queue
+      private
 
-    def queue=(queue)
-      @queue = queue
+      def current_timestamp
+        Time.now.to_i
+      end
     end
 
+    attr_accessor :queue
+
     def queue_reporters=(reporters)
       @queue_reporters ||= []
       Reporters.use!(((Reporters.reporters || []) - @queue_reporters) + reporters)
@@ -244,9 +263,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

data/lib/rspec/queue.rb

@@ -112,7 +112,7 @@ module RSpec
 
         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
         parser.separator ""

metadata

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