diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/drb/drbtest.rb | 10 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat May 19 14:41:45 2012 Tanaka Akira <akr@fsij.org> + + * test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill. + [ruby-dev:45551] reported by NARUSE, Yui. + Sat May 19 14:41:09 2012 Tanaka Akira <akr@fsij.org> * lib/drb/extservm.rb (DRb::ExtServManager): don't use /bin/sh to diff --git a/test/drb/drbtest.rb b/test/drb/drbtest.rb index 83ae2f93f5..24c67f27ec 100644 --- a/test/drb/drbtest.rb +++ b/test/drb/drbtest.rb @@ -75,7 +75,10 @@ module DRbCore DRbService.manager.unregist(@service_name) Thread.list.each {|th| if th.respond_to?(:pid) && th[:drb_service] == @service_name - Process.kill :TERM, th.pid + begin + Process.kill :TERM, th.pid + rescue Errno::ESRCH + end th.join end } @@ -289,7 +292,10 @@ module DRbAry DRbService.manager.unregist(@service_name) Thread.list.each {|th| if th.respond_to?(:pid) && th[:drb_service] == @service_name - Process.kill :TERM, th.pid + begin + Process.kill :TERM, th.pid + rescue Errno::ESRCH + end th.join end } @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 220 +#define RUBY_PATCHLEVEL 221 #define RUBY_RELEASE_DATE "2012-05-19" #define RUBY_RELEASE_YEAR 2012 |