Merge pull request #70 from bhuga/resilient-against-nil-exit-status

Use an error status instead of nil if we're missing a worker status code

Author: aroben

lib/test_queue/runner.rb

@@ -146,7 +146,7 @@ def summarize_internal
       unassigned_suites = []
       @failures = ''
       @completed.each do |worker|
-        estatus += worker.status.exitstatus
+        estatus += (worker.status.exitstatus || 1)
         @stats.record_suites(worker.suites)
         worker.suites.each do |suite|
           assignment = @assignments.delete([suite.name, suite.path])
@@ -163,13 +163,12 @@ def summarize_internal
 
         @failures << worker.failure_output if worker.failure_output
 
-        puts "    [%2d] %60s      %4d suites in %.4fs      (pid %d exit %d%s)" % [
+        puts "    [%2d] %60s      %4d suites in %.4fs      (%s %s)" % [
           worker.num,
           worker.summary,
           worker.suites.size,
           worker.end_time - worker.start_time,
-          worker.pid,
-          worker.status.exitstatus,
+          worker.status.to_s,
           worker.host && " on #{worker.host.split('.').first}"
         ]
       end
@@ -218,6 +217,7 @@ def summarize_internal
 
       summarize
 
+      estatus = @completed.inject(0){ |s, worker| s + (worker.status.exitstatus || 1)}
       [estatus, 255].min
     end
 

test/minitest5.bats

@@ -128,6 +128,13 @@ assert_test_queue_force_ordering() {
   assert_output_contains "MiniTestFailure#test_fail"
 }
 
+@test "recovers from child processes dying in an unorderly way" {
+  export KILL=1
+  run bundle exec minitest-queue ./test/samples/sample_minitest5.rb
+  assert_status 1
+  assert_output_contains "SIGKILL (signal 9)"
+}
+
 @test "minitest-queue fails when TEST_QUEUE_WORKERS is <= 0" {
   export TEST_QUEUE_WORKERS=0
   run bundle exec minitest-queue ./test/samples/sample_minitest5.rb

test/samples/sample_minitest5.rb

@@ -23,3 +23,11 @@ def test_fail
     end
   end
 end
+
+if ENV["KILL"]
+  class MiniTestKilledFailure < MiniTest::Test
+    def test_kill
+      Process.kill(9, $$)
+    end
+  end
+end