diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-20 02:24:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-20 02:24:42 +0000 |
commit | 5fe8065849039acbe859ea48a259ae8d5174da10 (patch) | |
tree | 7866a58facc011ae1425b726997bc4f6eb661f84 | |
parent | 51c44ab1ec742018525391a37386fe8f8bc813bb (diff) | |
download | ruby-5fe8065849039acbe859ea48a259ae8d5174da10.tar.gz |
lib/test/unit.rb: workers sudden-death
* lib/test/unit.rb (Test::Unit::Runner#_run_parallel): deal with
sudden-death of workers.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36147 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/test/unit.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Wed Jun 20 11:24:35 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/test/unit.rb (Test::Unit::Runner#_run_parallel): deal with + sudden-death of workers. + Mon Jun 18 20:34:20 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * time.c (init_leap_second_info): fix non-ANSI function declaration. diff --git a/lib/test/unit.rb b/lib/test/unit.rb index 3f5a6cb2de..05897aa260 100644 --- a/lib/test/unit.rb +++ b/lib/test/unit.rb @@ -544,7 +544,7 @@ module Test @warnings << Marshal.load($1.unpack("m")[0]) when /^bye (.+?)$/ after_worker_down worker, Marshal.load($1.unpack("m")[0]) - when /^bye$/ + when /^bye$/, nil if shutting_down || worker.quit_called after_worker_quit worker else |