From 73552a588fb85cbac1bcf06f5581d16128a7f321 Mon Sep 17 00:00:00 2001
From: stephsachrajda <steph.sachrajda@shopify.com>
Date: Tue, 17 Oct 2023 17:32:16 -0600
Subject: [PATCH] add more logging

---
 ruby/lib/ci/queue/redis/base.rb                  |  1 +
 ruby/lib/minitest/queue.rb                       | 10 +++++++++-
 ruby/lib/minitest/queue/build_status_recorder.rb |  3 +++
 ruby/lib/minitest/queue/runner.rb                | 10 ----------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ruby/lib/ci/queue/redis/base.rb b/ruby/lib/ci/queue/redis/base.rb
index f8bba79e..526bbeae 100644
--- a/ruby/lib/ci/queue/redis/base.rb
+++ b/ruby/lib/ci/queue/redis/base.rb
@@ -80,6 +80,7 @@ def queue_initializing?
         end
 
         def increment_test_failed
+          puts "---- incrementing cache test failed"
           redis.incr(key('test_failed_count'))
         end
 
diff --git a/ruby/lib/minitest/queue.rb b/ruby/lib/minitest/queue.rb
index dde1278e..6205d60a 100644
--- a/ruby/lib/minitest/queue.rb
+++ b/ruby/lib/minitest/queue.rb
@@ -245,17 +245,25 @@ def run_from_queue(reporter, *)
         end
 
         requeued = false
+
         if failed && CI::Queue.requeueable?(result) && queue.requeue(example)
           requeued = true
           result.requeue!
+          puts "---- requeable recording!"
           reporter.record(result)
-        elsif queue.acknowledge(example) || !failed
+        elsif queue.acknowledge(example)
           # If the test was already acknowledged by another worker (we timed out)
           # Then we only record it if it is successful.
+          puts "---- ACK recording!"
+          reporter.record(result)
+        elsif !failed
+          puts "---- not failed recording!"
           reporter.record(result)
         end
 
         if !requeued && failed
+          puts "---- id = #{example.id}"
+          puts "---- incrementing test failed in poll"
           queue.increment_test_failed
         end
       end
diff --git a/ruby/lib/minitest/queue/build_status_recorder.rb b/ruby/lib/minitest/queue/build_status_recorder.rb
index abe8911e..d89c7e44 100644
--- a/ruby/lib/minitest/queue/build_status_recorder.rb
+++ b/ruby/lib/minitest/queue/build_status_recorder.rb
@@ -43,13 +43,16 @@ def record(test)
         elsif test.skipped?
           self.skips += 1
         elsif test.error?
+          puts "--- increment error in record"
           self.errors += 1
         elsif test.failure
+          puts "--- increment failure in record"
           self.failures += 1
         end
 
         stats = COUNTERS.zip(COUNTERS.map { |c| send(c) }).to_h
         if (test.failure || test.error?) && !test.skipped?
+          puts "--- recording error in record"
           build.record_error("#{test.klass}##{test.name}", dump(test), stats: stats)
         else
           build.record_success("#{test.klass}##{test.name}", stats: stats, skip_flaky_record: test.skipped?)
diff --git a/ruby/lib/minitest/queue/runner.rb b/ruby/lib/minitest/queue/runner.rb
index bd79f1ac..afc4e06d 100644
--- a/ruby/lib/minitest/queue/runner.rb
+++ b/ruby/lib/minitest/queue/runner.rb
@@ -230,16 +230,6 @@ def report_command
             msg = "#{supervisor.size} tests weren't run."
             if supervisor.max_test_failed?
               puts("Encountered #{supervisor.test_failed} failures")
-
-              if queue_config.failure_file
-                reporter = BuildStatusReporter.new(build: supervisor.build)
-                failures = reporter.error_reports.map(&:to_h).to_json
-                puts "----"
-                puts failures
-                puts "----"
-                File.write(queue_config.failure_file, failures)
-              end
-
               puts('Encountered too many failed tests. Test run was ended early.')
               abort!(msg)
             else