From f7add52f8f5bca11c1d0e2c95dd7c65333036d0f Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 23 Oct 2018 14:17:16 +0000
Subject: [PATCH] test/unit.rb: fixed wrong method name

* test/lib/test/unit.rb (Test::Unit::Parallel#deal): fixed wrong
  method name at r36388.

* test/testunit/test_parallel.rb (TestParallel::TestParallel#test_separate):
  refine the pattern to process IDs but not backtrace lines, and
  add a better message.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65329 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/lib/test/unit.rb          | 2 +-
 test/testunit/test_parallel.rb | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb
index f588aec551..105a9a897d 100644
--- a/test/lib/test/unit.rb
+++ b/test/lib/test/unit.rb
@@ -404,7 +404,7 @@ module Test
           end
           if @options[:separate] and not bang
             worker.quit
-            worker = add_worker
+            worker = launch_worker
           end
           worker.run(task, type)
           @test_count += 1
diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb
index 89b5bfa50b..b11330b46d 100644
--- a/test/testunit/test_parallel.rb
+++ b/test/testunit/test_parallel.rb
@@ -195,7 +195,8 @@ module TestParallel
       # this test depends to --jobs-status
       spawn_runner "--jobs-status", "--separate"
       buf = Timeout.timeout(TIMEOUT) {@test_out.read}
-      assert(buf.scan(/(\d+?)[:=]/).flatten.uniq.size > 1)
+      assert(buf.scan(/^\[\s*\d+\/\d+\]\s*(\d+?)=/).flatten.uniq.size > 1,
+             message("retried tests should run in different processes") {buf})
     end
   end
 end