From 146bedd6c487aa0fd93d8af41900887ff6d500eb Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 14 Apr 2011 13:48:05 +0000 Subject: * lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a verb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31282 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 ++++- lib/test/unit.rb | 8 ++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31bf172669..0fc4c786d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -Thu Apr 14 22:47:54 2011 Nobuyoshi Nakada +Thu Apr 14 22:47:58 2011 Nobuyoshi Nakada + + * lib/test/unit.rb (Test::Unit::Runner::Worker#died): rename using a + verb. * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): check if worker is signaled and use its exit status. diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 6db79213a3..3ea9e7ba6a 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -260,10 +260,10 @@ module Test puts "run #{task} #{type}" @status = :prepare rescue Errno::EPIPE - dead + died rescue IOError raise unless ["stream closed","closed stream"].include? $!.message - dead + died end end @@ -283,7 +283,7 @@ module Test self end - def dead(*additional) + def died(*additional) @status = :quit @io.close @@ -409,7 +409,7 @@ module Test next unless w unless w.status == :quit # Worker down - w.dead(nil, !stat.signaled? && stat.exitstatus) + w.died(nil, !stat.signaled? && stat.exitstatus) end end end -- cgit v1.2.3