summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-19 05:42:08 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-19 05:42:08 +0000
commitca27aa831f540dde4e9ce24ca1f0b43d6e39b2cb (patch)
tree7fa81a5a11a14e084b071c16b46e0c4b25960362 /test
parent28db23778c1b73cbc2d12bcadae1d8ffb0768a87 (diff)
merge revision(s) 35433:
* test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill. [ruby-dev:45551] reported by NARUSE, Yui. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/drb/drbtest.rb10
1 files changed, 8 insertions, 2 deletions
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
}