ci-queue 0.13.3 → 0.13.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 382aec3675b3ce7db16188d59a277916634e3c84779faedd79c1a3c89ef89d17
-  data.tar.gz: a62b3004eec89334191a8c1086bb95cab2b6c6abfc5305a18ac44cbb6b7f34d9
+SHA1:
+  metadata.gz: d91fd02d29e5c4502c858d46890cdd17f8dd80f1
+  data.tar.gz: a9aff819b8b7d5c471f7100fd27317492224442b
 SHA512:
-  metadata.gz: d53bdaf3c81a5046b5cf583206d189433a8f4977c60f67cdf0bbdfeb0d95f39b1ac37629ce15c6c603d07f108288bf63fa5c5280301ce307584fc2ba09eee494
-  data.tar.gz: e881fd1040688d7bfcfe88ffbfb63f87af067347d61da653a7caa8e6dcbead2660751264bb1be7dc5687d964d926a2c6dace6422026d3060f997de8850618313
+  metadata.gz: c45c433780015c85763148708db522f47a41891fe02782bd7b5cdd05c8edc7e9ea9b5f4b4af45efc43a1f866bb753432040a78fa76d0383dce6120258ceab90a
+  data.tar.gz: 79684e26a534c56048d40c4ab0bd9d7efb9ef7149fb53e2746760f4c74eb2eb7b3baa9ed409a7198b98afb975be81319de0b4e6d70e790409216e79ef912daab

data/lib/ci/queue/common.rb

@@ -3,6 +3,9 @@ module CI
     module Common
       attr_reader :config
 
+      # to override in classes including this module
+      CONNECTION_ERRORS = [].freeze
+
       def flaky?(test)
         @config.flaky?(test)
       end
@@ -14,6 +17,12 @@ module CI
       def report_success!
         config.circuit_breaker.report_success!
       end
+
+      def rescue_connection_errors(handler = ->(err) { nil })
+        yield
+      rescue *self::class::CONNECTION_ERRORS => err
+        handler.call(err)
+      end
     end
   end
 end

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

@@ -4,6 +4,11 @@ module CI
       class Base
         include Common
 
+        CONNECTION_ERRORS = [
+          ::Redis::BaseConnectionError,
+          ::SocketError, # https://github.com/redis/redis-rb/pull/631
+        ].freeze
+
         def initialize(redis_url, config)
           @redis_url = redis_url
           @redis = ::Redis.new(url: redis_url)

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

@@ -3,11 +3,6 @@ require 'ci/queue/static'
 module CI
   module Queue
     module Redis
-      CONNECTION_ERRORS = [
-        ::Redis::BaseConnectionError,
-        ::SocketError, # https://github.com/redis/redis-rb/pull/631
-      ].freeze
-
       ReservationError = Class.new(StandardError)
 
       class << self

data/lib/ci/queue/static.rb

@@ -50,7 +50,6 @@ module CI
       def poll
         while !config.circuit_breaker.open? && test = @queue.shift
           yield index.fetch(test)
-          @progress += 1
         end
       end
 
@@ -59,6 +58,7 @@ module CI
       end
 
       def acknowledge(test)
+        @progress += 1
         true
       end
 

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue/runner.rb

@@ -57,8 +57,11 @@ module Minitest
 
         trap('TERM') { Minitest.queue.shutdown! }
         trap('INT') { Minitest.queue.shutdown! }
-        load_tests
-        populate_queue
+
+        unless queue.rescue_connection_errors { queue.exhausted? }
+          load_tests
+          populate_queue
+        end
         # Let minitest's at_exit hook trigger
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-06-26 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