Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ruby/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ci-queue (0.92.0)
ci-queue (0.93.0)
logger

GEM
Expand Down
2 changes: 1 addition & 1 deletion ruby/lib/ci/queue/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module CI
module Queue
VERSION = '0.92.0'
VERSION = '0.93.0'
DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
end
Expand Down
2 changes: 2 additions & 0 deletions ruby/lib/minitest/queue/runner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@ def run_command
puts "#{remaining} tests left and #{running} workers running."
if remaining <= running
puts green("Queue almost empty, exiting early...")
verify_reporters!(reporters)
exit!(0)
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ChrisBr Rather than falling through, what are your thoughts on just exiting cleanly here rather than worrying about the guards?

else
prepare_queue_for_execution
end
Expand Down
4 changes: 4 additions & 0 deletions ruby/test/ci/queue/redis_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,10 @@ def test_worker_does_not_pick_up_its_own_requeued_test_when_others_are_available
w1 = worker(1, tests: test_list, build_id: 'self-requeue', timeout: 10, max_requeues: 1, requeue_tolerance: 1.0)
w2 = worker(2, populate: false, build_id: 'self-requeue', timeout: 10, max_requeues: 1, requeue_tolerance: 1.0)
w3 = worker(3, populate: false, build_id: 'self-requeue', timeout: 10, max_requeues: 1, requeue_tolerance: 1.0)
# Identity resolver so poll yields the raw queue entry (poll now skips
# UnresolvedEntry values, and these workers don't share w1's @index).
w2.entry_resolver = ->(entry) { entry }
w3.entry_resolver = ->(entry) { entry }
w2.send(:register)
w3.send(:register)

Expand Down
Loading