Move reporter up

Shopify · Jan 4, 2024 · 36f8875 · 36f8875
1 parent df21dc7
commit 36f8875
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/ruby/lib/minitest/queue/runner.rb b/ruby/lib/minitest/queue/runner.rb
@@ -227,11 +227,11 @@ def report_command
           end
 
           unless supervisor.exhausted?
+            reporter = BuildStatusReporter.new(build: supervisor.build)
+            reporter.report
             msg = "#{supervisor.size} tests weren't run."
             if supervisor.max_test_failed?
               puts('Encountered too many failed tests. Test run was ended early.')
-              reporter = BuildStatusReporter.new(build: supervisor.build)
-              reporter.report
               abort!(msg)
             else
               abort!(msg)

diff --git a/ruby/test/integration/minitest_redis_test.rb b/ruby/test/integration/minitest_redis_test.rb
@@ -159,11 +159,14 @@ def test_max_test_failed
       assert_empty err
       expected = <<~EXPECTED
         Waiting for workers to complete
-        Encountered too many failed tests. Test run was ended early.
         Ran 3 tests, 47 assertions, 3 failures, 0 errors, 0 skips, 44 requeues in X.XXs (aggregated)
       EXPECTED
-      assert_equal expected.strip, normalize(out.lines[0..3].join.strip)
-      assert_equal "97 tests weren't run.", normalize(out.lines.last.strip)
+      assert_equal expected.strip, normalize(out.lines[0..2].join.strip)
+      expected = <<~EXPECTED
+        Encountered too many failed tests. Test run was ended early.
+        97 tests weren't run.
+      EXPECTED
+      assert_equal expected.strip, normalize(out.lines.last(2).join.strip)
     end
 
     def test_circuit_breaker