ci-queue 0.13.6 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 51999072c7493dd67d4e45e86bfa5b80aac05d84927cd759e5cd0cbb01ad943d
-  data.tar.gz: b7183cbdb6f0364d079b92b6186f7987d9ffe6e4cf0aba46ebfdeaa146d6e181
+SHA1:
+  metadata.gz: 69f2c43d6407cb468d6f0288aa8b32c1a41435b2
+  data.tar.gz: '018ef68ddc3ddb821053174180c2380aefcb24f8'
 SHA512:
-  metadata.gz: b5339fc47648c6d7f38325ea8c5474c535df2fff3c3d3c15083698b28146d60de616e83baa0bbf82ea11a4c8d76ffb776a626c6d3358db242e05fb802216ac83
-  data.tar.gz: 277b48daa9d63af660117f953da9a6ccd839ff3be6162c77cf867bc9af74fa083d67d310fa69f23592e027c7374ed061c4155889539ab946e4eef24b17e140b2
+  metadata.gz: 5cff6680090e17d0d342a44b73239b2a0075fbbecab53aa534b5e18722ca363e79398ab5685ba5e103b5e672f7b3a1150d0029275669407ede79c9b0df0f2ba0
+  data.tar.gz: f14aba376b3d2484f80273e7020b650cad4c8dff046a139eafac1273160646e1676d083f3252938e12882d3cbddac64cc33542d6fd81f37affc4c82646a8e4a3

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

@@ -16,6 +16,10 @@ module CI
           @queue.exhausted?
         end
 
+        def failed_tests
+          redis.hkeys(key('error-reports'))
+        end
+
         def record_error(id, payload, stats: nil)
           redis.pipelined do
             redis.hset(

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

@@ -55,7 +55,11 @@ module CI
         end
 
         def retry_queue
-          log = redis.lrange(key('worker', worker_id, 'queue'), 0, -1).reverse.uniq
+          failures = build.failed_tests.to_set
+          log = redis.lrange(key('worker', worker_id, 'queue'), 0, -1)
+          log.select! { |id| failures.include?(id) }
+          log.uniq!
+          log.reverse!
           Retry.new(log, config, redis: redis)
         end
 

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/runner.rb

@@ -37,7 +37,10 @@ module Minitest
       end
 
       def retry_command
-        self.queue = queue.retry_queue
+        retry_queue = queue.retry_queue
+        unless retry_queue.exhausted?
+          self.queue = retry_queue
+        end
         run_command
       end
 
@@ -58,7 +61,9 @@ module Minitest
         trap('TERM') { Minitest.queue.shutdown! }
         trap('INT') { Minitest.queue.shutdown! }
 
-        unless queue.rescue_connection_errors { queue.exhausted? }
+        if queue.rescue_connection_errors { queue.exhausted? }
+          puts green("All tests were ran already")
+        else
           load_tests
           populate_queue
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.13.6
+  version: 0.14.0
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -226,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Distribute tests over many workers using a queue