ci-queue 0.20.2 → 0.20.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8102503b55cb4135eeb185d6e7e2aa222c2ce3f0c94fb6292d349ac994c7cfa9
-  data.tar.gz: 77295aa7996d840c209019c108c4ededcbdbff3d62918b7e727319ad02f16e34
+  metadata.gz: 869f4269443defdf645936cf4b6cf969dd821263b9a96b4de71da7bbbbd98152
+  data.tar.gz: 3aa8a19f472ed869a88f35b3c124a01700fc1acf235617c5f78dcb67232f91c8
 SHA512:
-  metadata.gz: d0f60b68573a8f61ef047caaeb85cd76be62051a2f953004aa89b12679eed9558af83545f49f8da4293bfc88526ea11f61bddfcbfc4a70e28d5c706418696665
-  data.tar.gz: e8ac8d7f4bd819615d58a3325817599d33878409c8104a0f2594c81fd0ddf4b77b1851a524a6851b9462f9b61f6c5d5cc38a44e0e6cd03a6f78acef1264879ea
+  metadata.gz: 7d5cd85fe45b05060738a72f6be624e3cfef6bf9a24ea3019433773aa7bb8a7a6f5ef94dc6a0d2cce5a2d04d4b820ca242f41f07e8720aa2f004f528bc4de372
+  data.tar.gz: a82a023c73718e924210c2a379d6195b62062731679c24c6a230cff26df3d455107c1a902d8a9a97fd3a2a2510a6c145e8f02545121720139ad2e2802d37b3ae

data/README.md

@@ -51,7 +51,9 @@ The runner also comes with a tool to investigate leaky tests:
 minitest-queue --queue path/to/test_order.log --failing-test 'SomeTest#test_something' bisect -Itest test/**/*_test.rb
 ```
 
-### RSpec
+### RSpec [DEPRECATED]
+
+The rspec-queue runner is deprecated. The minitest-queue runner continues to be supported and is actively being improved. At Shopify, we strongly recommend that new projects set up their test suite using Minitest rather than RSpec.
 
 Assuming you use one of the supported CI providers, the command can be as simple as:
 
@@ -67,4 +69,4 @@ rspec-queue --queue redis://example.com --timeout 600 --report
 
 #### Limitations
 
-Because of how `ci-queue` execute the examples, `before(:all)` and `after(:all)` hooks are not supported. `rspec-queue` will explicitly reject them.
+Because of how `ci-queue` executes the examples, `before(:all)` and `after(:all)` hooks are not supported. `rspec-queue` will explicitly reject them.

data/ci-queue.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')
   spec.add_development_dependency 'rspec', '~> 3.7.0'
-  spec.add_development_dependency 'redis', '~> 3.3'
+  spec.add_development_dependency 'redis'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
 

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

@@ -56,10 +56,18 @@ module CI
         rescue *CONNECTION_ERRORS
         end
 
-        def retrying?
-          redis.exists(key('worker', worker_id, 'queue'))
-        rescue *CONNECTION_ERRORS
-          false
+        if ::Redis.method_defined?(:exists?)
+          def retrying?
+            redis.exists?(key('worker', worker_id, 'queue'))
+          rescue *CONNECTION_ERRORS
+            false
+          end
+        else
+          def retrying?
+            redis.exists(key('worker', worker_id, 'queue'))
+          rescue *CONNECTION_ERRORS
+            false
+          end
         end
 
         def retry_queue

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/error_report.rb

@@ -58,6 +58,10 @@ module Minitest
         @data[:test_and_module_name]
       end
 
+      def test_suite
+        @data[:test_suite]
+      end
+
       def test_file
         @data[:test_file]
       end

data/lib/minitest/queue/failure_formatter.rb

@@ -27,6 +27,7 @@ module Minitest
           test_line: test_line,
           test_and_module_name: "#{test.klass}##{test.name}",
           test_name: test.name,
+          test_suite: test.klass,
           error_class: test.failure.exception.class.name,
           output: to_s,
         }

data/lib/minitest/queue/junit_reporter.rb

@@ -96,13 +96,16 @@ module Minitest
         message.lines.first.chomp.gsub(/\e\[[^m]+m/, '')
       end
 
+      def project_root_path_matcher
+        @project_root_path_matcher ||= %r{(?<=\s)#{Regexp.escape(Minitest::Queue.project_root)}/}
+      end
+
       def message_for(test)
         suite = test.klass
         name = test.name
         error = test.failure
 
-        message_with_relative_paths = error.message.gsub("#{Minitest::Queue.project_root}/", '')
-
+        message_with_relative_paths = error.message.gsub(project_root_path_matcher, '')
         if test.passed?
           nil
         elsif test.skipped?

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.20.2
+  version: 0.20.7
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-13 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement