Skip to content

Improvements to printing out errors #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nikita8 merged 1 commit into from
Mar 12, 2025
Merged

Improvements to printing out errors #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 8 additions & 21 deletions ruby/lib/ci/queue/redis/supervisor.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,41 +24,28 @@ def wait_for_workers

yield if block_given?

time_left = config.report_timeout - duration.to_i
time_left_with_no_workers = config.inactive_workers_timeout
until exhausted? || time_left <= 0 || max_test_failed? || time_left_with_no_workers <= 0
time_left -= 1
@time_left = config.report_timeout - duration.to_i
@time_left_with_no_workers = config.inactive_workers_timeout
until exhausted? || @time_left <= 0 || max_test_failed? || @time_left_with_no_workers <= 0
@time_left -= 1
sleep 1

if active_workers?
time_left_with_no_workers = config.inactive_workers_timeout
@time_left_with_no_workers = config.inactive_workers_timeout
else
time_left_with_no_workers -= 1
@time_left_with_no_workers -= 1
end

yield if block_given?
end

if time_left <= 0 && !exhausted?
puts "Aborting, timed out."

remaining_tests = test_ids
remaining_tests.first(10).each do |id|
puts " #{id}"
end

if remaining_tests.size > 10
puts " ..."
end
end

puts "Aborting, it seems all workers died." if time_left_with_no_workers <= 0 && !exhausted?

exhausted?
rescue CI::Queue::Redis::LostMaster
false
end

attr_reader :time_left, :time_left_with_no_workers

private

def active_workers?
Expand Down
24 changes: 21 additions & 3 deletions ruby/lib/minitest/queue/build_status_reporter.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ module Queue
class BuildStatusReporter < Minitest::Reporters::BaseReporter
include ::CI::Queue::OutputHelpers

def initialize(build:, **options)
@build = build
def initialize(supervisor:, **options)
@supervisor = supervisor
@build = supervisor.build
super(options)
end

Expand All @@ -27,6 +28,23 @@ def requeued_tests

def report
puts aggregates

if supervisor.time_left.to_i <= 0
puts "Timed out waiting for tests to be executed."

remaining_tests = supervisor.test_ids
remaining_tests.first(10).each do |id|
puts " #{id}"
end

if remaining_tests.size > 10
puts " ..."
end
end

puts "All workers died." if supervisor.time_left_with_no_workers.to_i <= 0
puts 'Encountered too many failed tests. Test run was ended early.' if supervisor.max_test_failed?

errors = error_reports
puts errors

Expand Down Expand Up @@ -92,7 +110,7 @@ def write_flaky_tests_file(file)

private

attr_reader :build
attr_reader :build, :supervisor

def aggregates
success = failures.zero? && errors.zero?
Expand Down
13 changes: 3 additions & 10 deletions ruby/lib/minitest/queue/runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,23 +257,16 @@ def report_command
end

unless supervisor.exhausted?
reporter = BuildStatusReporter.new(build: supervisor.build)
reporter = BuildStatusReporter.new(supervisor: supervisor)
reporter.report
reporter.write_failure_file(queue_config.failure_file) if queue_config.failure_file
reporter.write_flaky_tests_file(queue_config.export_flaky_tests_file) if queue_config.export_flaky_tests_file

msg = "#{supervisor.size} tests weren't run."

if supervisor.max_test_failed?
puts('Encountered too many failed tests. Test run was ended early.')
abort!(msg)
else
abort!(msg)
end
abort!("#{supervisor.size} tests weren't run.")
end
end

reporter = BuildStatusReporter.new(build: supervisor.build)
reporter = BuildStatusReporter.new(supervisor: supervisor)
reporter.write_failure_file(queue_config.failure_file) if queue_config.failure_file
reporter.write_flaky_tests_file(queue_config.export_flaky_tests_file) if queue_config.export_flaky_tests_file
reporter.report
Expand Down
12 changes: 0 additions & 12 deletions ruby/test/ci/queue/redis_supervisor_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,6 @@ def test_wait_for_workers
assert_equal true, workers_done
end

def test_wait_for_workers_timeout
@supervisor = supervisor(timeout: 10, queue_init_timeout: 0.1)
io = nil
thread = Thread.start do
io = capture_io { @supervisor.wait_for_workers }
end
thread.wakeup
worker(1)
thread.join
assert_includes io.join, "Aborting, it seems all workers died.\n"
end

def test_num_workers
assert_equal 0, @supervisor.workers_count
worker(1)
Expand Down
28 changes: 27 additions & 1 deletion ruby/test/integration/minitest_redis_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,35 @@ def test_max_test_failed
assert_equal expected.strip, normalize(out.lines[0..2].join.strip)
expected = <<~EXPECTED
Encountered too many failed tests. Test run was ended early.
EXPECTED
assert_equal expected.strip, normalize(out.lines[3].strip)
expected = <<~EXPECTED
97 tests weren't run.
EXPECTED
assert_equal expected.strip, normalize(out.lines.last(2).join.strip)
assert_equal expected.strip, normalize(out.lines.last.strip)
end

def test_all_workers_died
# Run the reporter
out, err = capture_subprocess_io do
system(
@exe, 'report',
'--queue', @redis_url,
'--seed', 'foobar',
'--build', '1',
'--timeout', '1',
'--max-test-failed', '3',
chdir: 'test/fixtures/',
)
end

refute_predicate $?, :success?
assert_empty err
expected = <<~EXPECTED
Waiting for workers to complete
No master was elected. Did all workers crash?
EXPECTED
assert_equal expected.strip, normalize(out.lines[0..2].join.strip)
end

def test_circuit_breaker
Expand Down
2 changes: 1 addition & 1 deletion ruby/test/minitest/queue/build_status_recorder_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def worker(id)
end

def summary
@summary ||= Minitest::Queue::BuildStatusReporter.new(build: @queue.supervisor.build)
@summary ||= Minitest::Queue::BuildStatusReporter.new(supervisor: @queue.supervisor)
end
end
end
Loading