From ff49900ab431e88dc05c14ffd65b92735dcf8bc9 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 15 Jun 2012 22:46:08 +0000 Subject: [PATCH] lib/test/unit.rb: format workers results in the parent * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): format workers results in the parent. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36108 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/test/unit.rb | 4 +++- test/testunit/test_parallel.rb | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 7b3554cbed..213645a772 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -614,7 +614,9 @@ module Test end unless rep.empty? rep.each do |r| - report.push(*r[:report]) + r[:report].each do |f| + report.push(puke(*f)) if f + end end @errors += rep.map{|x| x[:result][0] }.inject(:+) @failures += rep.map{|x| x[:result][1] }.inject(:+) diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb index 5f7655bc72..9d1bc57b7f 100644 --- a/test/testunit/test_parallel.rb +++ b/test/testunit/test_parallel.rb @@ -104,8 +104,9 @@ module TestParallel assert_kind_of(Array,result[2]) assert_kind_of(Array,result[3]) assert_kind_of(Array,result[4]) - assert_match(/Skipped:$/,result[2][1]) - assert_match(/Failure:$/,result[2][0]) + assert_kind_of(Array,result[2][1]) + assert_kind_of(MiniTest::Assertion,result[2][0][2]) + assert_kind_of(MiniTest::Skip,result[2][1][2]) assert_equal(result[5], "TestE") end end