Skip to content
Browse files

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
  • Loading branch information...
1 parent 3f6e8ae commit ff49900ab431e88dc05c14ffd65b92735dcf8bc9 @nobu nobu committed Jun 15, 2012
Showing with 6 additions and 3 deletions.
  1. +3 −1 lib/test/unit.rb
  2. +3 −2 test/testunit/test_parallel.rb
View
4 lib/test/unit.rb
@@ -614,7 +614,9 @@ def _run_parallel suites, type, result
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(:+)
View
5 test/testunit/test_parallel.rb
@@ -104,8 +104,9 @@ def test_done
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

0 comments on commit ff49900

Please sign in to comment.
Something went wrong with that request. Please try again.