summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/drb/drbtest.rb10
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a525a5c1d0..5ce5fdcffb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Apr 23 19:54:33 2012 Tanaka Akira <akr@fsij.org>
+
+ * test/drb/drbtest.rb: rescue Errno::ESRCH for Process.kill.
+ [ruby-dev:45551] reported by NARUSE, Yui.
+
Mon Apr 23 14:16:45 2012 NARUSE, Yui <naruse@ruby-lang.org>
* .gdbinit (rb_ps_vm): follow st_table's packing change.
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
}