ci-queue 0.88.0 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac982ecc1b30c78d14e45bbbe7d8e26841879eae6fec791dd82508159ce6c8dd
-  data.tar.gz: 7f960c1a77b8e93bd8c18894b86f428df16f181f671bb7e000063a968e50374c
+  metadata.gz: 87b11dfe365c8f57a79ef1d5b65e4f422a1fce2bd94d51b0d653d10bfb95120a
+  data.tar.gz: 1a530c84f9883b85f0784b33e67044f5a325a5815dc06d4b89872b76d1127a74
 SHA512:
-  metadata.gz: 1582e95243e4939268acc7bbaced2fc90471b0b86934d35169647ccde1e19c8d03027650e1f9efa909c2d6aafc85c8cce8a251c65de3cecdc906e64da8bb2a0b
-  data.tar.gz: d8c67176e15c7d78b175af35309bab1136a3053da0db9404449d5770b764bba1e0d25c6671607c090d5e8951e65711ea94eded4cd59f50032b8336fea1eeed7b
+  metadata.gz: 25e7f86d44fc3428e6f1d08430a3940348ae9d2d2561c190894d7a6e1b197d00b22a97fefcb5ade8462d2ccc0e14255ff9d4f10571e5f1f99dd8758b45d8a066
+  data.tar.gz: 0c676475b941684ad92d43088612e31adb597f2f2c22f383e55c8d2dbc2cfa68646e013a58000191f5fecb16aee8151b5ce8f14cd97fe2d9ca2f11c3fd57cf3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.88.0)
+    ci-queue (0.89.0)
       logger
 
 GEM

data/lib/ci/queue/queue_entry.rb

@@ -17,7 +17,9 @@ module CI
       end
 
       def self.format(test_id, file_path)
-        JSON.dump({ test_id: test_id, file_path: file_path })
+        raise ArgumentError, "file_path is required for '#{test_id}' — the test file path must be resolvable" if file_path.nil? || file_path.empty?
+        canonical = load_error_payload?(file_path) ? file_path : ::File.expand_path(file_path)
+        JSON.dump({ test_id: test_id, file_path: canonical })
       end
 
       def self.load_error_payload?(file_path)

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

@@ -145,6 +145,10 @@ module CI
           redis.hgetall(key('error-reports')).transform_keys { |entry| CI::Queue::QueueEntry.test_id(entry) }
         end
 
+        def failed_test_entries
+          redis.hkeys(key('error-reports'))
+        end
+
         def flaky_reports
           redis.smembers(key('flaky-reports')).map { |entry| CI::Queue::QueueEntry.test_id(entry) }
         end
@@ -177,6 +181,16 @@ module CI
               pipeline.hdel(key(stat_name), config.worker_id)
             end
           end
+          # Purge any error-report-deltas that reference this worker so that
+          # apply_error_report_delta_correction cannot double-subtract from
+          # the now-zeroed counters on a subsequent successful retry.
+          deltas = redis.hgetall(key('error-report-deltas'))
+          to_delete = deltas.filter_map do |entry, delta_json|
+            entry if JSON.parse(delta_json)['worker_id'].to_s == config.worker_id.to_s
+          rescue JSON::ParserError
+            nil
+          end
+          redis.hdel(key('error-report-deltas'), *to_delete) unless to_delete.empty?
         end
 
         private

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

@@ -28,9 +28,24 @@ module CI
           self
         end
 
+        # Queue a Redis SADD so that BuildRecord#record_success can include this
+        # in its multi-exec transaction. Without this, Static#acknowledge returns
+        # a Ruby value (not a Redis future), shifting the result indices and
+        # breaking the stats delta correction.
+        def acknowledge(entry, error: nil, pipeline: redis)
+          @progress += 1
+          return @progress unless pipeline
+          test_id = CI::Queue::QueueEntry.test_id(entry)
+          pipeline.sadd(key('processed'), test_id)
+        end
+
         private
 
         attr_reader :redis
+
+        def key(*args)
+          ['build', config.build_id, *args].join(':')
+        end
       end
     end
   end

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

@@ -158,6 +158,15 @@ module CI
           log.select! { |entry| failures.include?(CI::Queue::QueueEntry.test_id(entry)) }
           log.uniq! { |entry| CI::Queue::QueueEntry.test_id(entry) }
           log.reverse!
+
+          if log.empty?
+            # Per-worker log has no matching failures — this worker didn't run
+            # the failing tests (e.g. Buildkite rebuild with new worker IDs,
+            # or a different parallel slot). Fall back to ALL unresolved
+            # failures from error-reports so any worker can retry them.
+            log = redis.hkeys(key('error-reports'))
+          end
+
           Retry.new(log, config, redis: redis)
         end
 

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue.rb

@@ -330,7 +330,16 @@ module Minitest
       end
 
       def queue_entry
-        @queue_entry ||= CI::Queue::QueueEntry.format(id, nil)
+        @queue_entry ||= begin
+          unless runnable.is_a?(Module)
+            raise ArgumentError, "runnable must be a Module (got #{runnable.class}). " \
+              "Do not create SingleExample with string class names."
+          end
+          file_path = runnable.instance_method(method_name).source_location&.first
+          raise ArgumentError, "Cannot resolve source file for #{id} — " \
+            "ensure the test method is defined in a Ruby source file" if file_path.nil?
+          CI::Queue::QueueEntry.format(id, file_path)
+        end
       end
 
       def <=>(other)

data/lib/rspec/queue/build_status_recorder.rb

@@ -18,13 +18,13 @@ module RSpec
 
       def example_passed(notification)
         example = notification.example
-        entry = CI::Queue::QueueEntry.format(example.id, nil)
+        entry = CI::Queue::QueueEntry.format(example.id, example.file_path)
         build.record_success(entry)
       end
 
       def example_failed(notification)
         example = notification.example
-        entry = CI::Queue::QueueEntry.format(example.id, nil)
+        entry = CI::Queue::QueueEntry.format(example.id, example.file_path)
         build.record_error(entry, dump(notification))
       end
 

data/lib/rspec/queue.rb

@@ -254,7 +254,10 @@ module RSpec
       end
 
       def queue_entry
-        @queue_entry ||= CI::Queue::QueueEntry.format(id, nil)
+        @queue_entry ||= begin
+          file_path = example.metadata[:absolute_file_path] || example.file_path
+          CI::Queue::QueueEntry.format(id, file_path)
+        end
       end
 
       def <=>(other)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.88.0
+  version: 0.89.0
 platform: ruby
 authors:
 - Jean Boussier