ci-queue 0.14.1 → 0.15.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e9c5f96cd424f499c6a46f3ffbfa21023547b4cc
-  data.tar.gz: 39d18875123ae38c81c8788a7776aa99faf4c532
+SHA256:
+  metadata.gz: 6ec83e0947a4bb046b27a52b6b701909b79e4ee3143d65f92a4ecf7f2bc96560
+  data.tar.gz: c974a1aacd13149f737120a4dc25777a9fd1bd916bde9cf6bd58038ef7f72e70
 SHA512:
-  metadata.gz: 489781b113ce8f0834516253a49e4135c75a976ebc42d1320a1cca5145c85ff15ab2fd6c4b35456d6d8abf53d8e43ec0d106570a85ce029ebfc750892f990a4d
-  data.tar.gz: 7e32d21f7bb3ee434a8e86f7ecd4d866bd6c9b42ddfe3f3a241c6030df2ca5f544b2ccfb7d781bf1c35986b7611cedbdf780152b6b8bcd80c9ce7143c82a6105
+  metadata.gz: 9341e3a10a483c6837008c9532e7be39ae2238e8a182165271dada1a308ff9aca41e28245ef34fe29391abf1eaab66583ecd9613429dee61d924efea0bf534ee
+  data.tar.gz: 920fdc913153b762e8ed9a64ecf851ba17a132048a123064eda0475f38575434f1aa642c5a26e2501916c80007c73126e0addc514fc5bd3bb4d55d8fed7d6857

data/ci-queue.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'ansi'
 
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', "~> 10.0"
   spec.add_development_dependency 'minitest', ENV.fetch('MINITEST_VERSION', '~> 5.11')
   spec.add_development_dependency 'rspec', '~> 3.7.0'

data/lib/ci/queue/common.rb

@@ -6,6 +6,10 @@ module CI
       # to override in classes including this module
       CONNECTION_ERRORS = [].freeze
 
+      def retrying?
+        false
+      end
+
       def flaky?(test)
         @config.flaky?(test)
       end

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

@@ -54,6 +54,12 @@ module CI
         rescue *CONNECTION_ERRORS
         end
 
+        def retrying?
+          redis.exists(key('worker', worker_id, 'queue'))
+        rescue *CONNECTION_ERRORS
+          false
+        end
+
         def retry_queue
           failures = build.failed_tests.to_set
           log = redis.lrange(key('worker', worker_id, 'queue'), 0, -1)

data/lib/ci/queue/version.rb

@@ -1,6 +1,6 @@
 module CI
   module Queue
-    VERSION = '0.14.1'
+    VERSION = '0.15.0.beta1'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/order_reporter.rb

@@ -14,6 +14,7 @@ class Minitest::Queue::OrderReporter < Minitest::Reporters::BaseReporter
   def before_test(test)
     super
     @file.puts("#{test.class.name}##{test.name}")
+    @file.flush
   end
 
   def report

data/lib/minitest/queue/runner.rb

@@ -37,15 +37,22 @@ module Minitest
       end
 
       def retry_command
-        reset_counters
-        retry_queue = queue.retry_queue
-        unless retry_queue.exhausted?
-          self.queue = retry_queue
-        end
-        run_command
+        STDERR.puts "Warning: the retry subcommand is deprecated."
+        run_command # aliased for backward compatibility purpose
       end
 
       def run_command
+        if queue.retrying?
+          reset_counters
+          retry_queue = queue.retry_queue
+          if retry_queue.exhausted?
+            puts "The retry queue does not contain any failure, we'll process the main queue instead."
+          else
+            puts "Retrying failed tests."
+            self.queue = retry_queue
+          end
+        end
+
         set_load_path
         Minitest.queue = queue
         reporters = [

data/lib/rspec/queue.rb

@@ -18,10 +18,6 @@ module RSpec
         configuration.queue_url || ENV['CI_QUEUE_URL']
       end
 
-      def retrying
-        configuration.retrying
-      end
-
       def invalid_usage!(message)
         reopen_previous_step
         puts red(message)
@@ -52,11 +48,10 @@ module RSpec
     end
 
     Core::Configuration.add_setting(:queue_url)
-    Core::Configuration.add_setting(:retrying)
     Core::Configuration.prepend(ConfigurationExtension)
 
     module ConfigurationOptionsExtension
-      attr_accessor :queue_url, :retrying
+      attr_accessor :queue_url
     end
     Core::ConfigurationOptions.prepend(ConfigurationOptionsExtension)
 
@@ -90,7 +85,7 @@ module RSpec
           Replays a previous run in the same order.
         EOS
         parser.on('--retry', *help) do |url|
-          options[:retrying] = true
+          STDERR.puts "Warning: The --retry flag is deprecated"
         end
 
         help = split_heredoc(<<-EOS)
@@ -375,7 +370,18 @@ module RSpec
         end
 
         queue = CI::Queue.from_uri(queue_url, RSpec::Queue.config)
-        queue = queue.retry_queue if retrying
+
+        if queue.retrying?
+          retry_queue = queue.retry_queue
+          if retry_queue.exhausted?
+            puts "Found 0 tests to retry, processing the main queue."
+          else
+            puts "Retrying #{retry_queue.size} failed tests."
+            reset_counters
+            queue = retry_queue
+          end
+        end
+
         BuildStatusRecorder.build = queue.build
         queue.populate(examples, random: ordering_seed, &:id)
         examples_count = examples.size # TODO: figure out which stub value would be best

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0.beta1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2019-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -28,16 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -221,12 +221,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Distribute tests over many workers using a queue