Fix SLAVE regex, log unrecognized commands

lib/test_queue/runner.rb

@@ -451,7 +451,7 @@ def distribute_queue
               data = Marshal.dump(obj)
               sock.write(data)
             end
-          when /^SLAVE (\d+) ([\w\.-]+) (?: (.+))?/
+          when /^SLAVE (\d+) ([\w\.-]+)(?: (.+))?/
             num = $1.to_i
             slave = $2
             slave_message = $3
@@ -474,6 +474,8 @@ def distribute_queue
             # worker reporting an abnormal number of test failures;
             # stop everything immediately and report the results.
             break
+          else
+            STDERR.puts("Ignoring unrecognized command: \"#{cmd}\"")
           end
           sock.close
         end

test/minitest5.bats

@@ -74,23 +74,52 @@ assert_test_queue_force_ordering() {
   assert_output_contains "Failed to discover DoesNotExist specified in TEST_QUEUE_FORCE"
 }
 
-@test "multi-master succeeds when all tests pass" {
+@test "multi-master central master succeeds when all tests pass" {
   export TEST_QUEUE_RELAY_TOKEN=$(date | cksum | cut -d' ' -f1)
-  TEST_QUEUE_RELAY=0.0.0.0:12345 bundle exec minitest-queue ./test/samples/sample_minitest5.rb || true &
+  export SLEEP_AS_RELAY=1
+  TEST_QUEUE_RELAY=0.0.0.0:12345 bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb || true &
   sleep 0.1
-  TEST_QUEUE_SOCKET=0.0.0.0:12345 run bundle exec minitest-queue ./test/samples/sample_minitest5.rb
+  TEST_QUEUE_SOCKET=0.0.0.0:12345 run bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb
   wait
 
   assert_status 0
   assert_output_contains "Starting test-queue master"
 }
 
-@test "multi-master fails when a test fails" {
+@test "multi-master remote master succeeds when all tests pass" {
+  export TEST_QUEUE_RELAY_TOKEN=$(date | cksum | cut -d' ' -f1)
+  export SLEEP_AS_MASTER=1
+  TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb || true &
+  sleep 0.1
+  TEST_QUEUE_RELAY=0.0.0.0:12345 run bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb
+  wait
+
+  assert_status 0
+  assert_output_contains "Starting test-queue master"
+}
+
+@test "multi-master central master fails when a test fails" {
+  export FAIL=1
+  export SLEEP_AS_RELAY=1
+  export TEST_QUEUE_RELAY_TOKEN=$(date | cksum | cut -d' ' -f1)
+  TEST_QUEUE_RELAY=0.0.0.0:12345 bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb || true &
+  sleep 0.1
+  TEST_QUEUE_SOCKET=0.0.0.0:12345 run bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb
+  wait
+
+  assert_status 1
+  assert_output_contains "Starting test-queue master"
+  assert_output_contains "1) Failure:"
+  assert_output_contains "MiniTestFailure#test_fail"
+}
+
+@test "multi-master remote master fails when a test fails" {
   export FAIL=1
+  export SLEEP_AS_MASTER=1
   export TEST_QUEUE_RELAY_TOKEN=$(date | cksum | cut -d' ' -f1)
-  TEST_QUEUE_RELAY=0.0.0.0:12345 bundle exec minitest-queue ./test/samples/sample_minitest5.rb || true &
+  TEST_QUEUE_SOCKET=0.0.0.0:12345 bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb || true &
   sleep 0.1
-  TEST_QUEUE_SOCKET=0.0.0.0:12345 run bundle exec minitest-queue ./test/samples/sample_minitest5.rb
+  TEST_QUEUE_RELAY=0.0.0.0:12345 run bundle exec ruby ./test/sleepy_runner.rb ./test/samples/sample_minitest5.rb
   wait
 
   assert_status 1

test/sleepy_runner.rb

@@ -0,0 +1,14 @@
+require 'test_queue'
+require 'test_queue/runner/minitest'
+
+class SleepyTestRunner < TestQueue::Runner::MiniTest
+  def after_fork(num)
+    if ENV['SLEEP_AS_RELAY'] && relay? 
+      sleep 5
+    elsif ENV['SLEEP_AS_MASTER'] && !relay?
+      sleep 5
+    end
+  end
+end
+
+SleepyTestRunner.new.execute