mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
if it fails with Errno::EPERM on Windows (workaround). [ruby-dev:47245] [Bug #8251] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40232 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
43c93dbdd9
commit
13fb747c37
2 changed files with 26 additions and 6 deletions
|
@ -1,3 +1,9 @@
|
|||
Thu Apr 11 13:19:22 2013 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* test/drb/drbtest.rb (Drb{Core,Ary}#teardown): retry Process.kill
|
||||
if it fails with Errno::EPERM on Windows (workaround).
|
||||
[ruby-dev:47245] [Bug #8251]
|
||||
|
||||
Thu Apr 11 11:11:38 2013 Akinori MUSHA <knu@iDaemons.org>
|
||||
|
||||
* dir.c: Fix a typo.
|
||||
|
|
|
@ -79,9 +79,16 @@ module DRbCore
|
|||
signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
|
||||
Thread.list.each {|th|
|
||||
if th.respond_to?(:pid) && th[:drb_service] == @service_name
|
||||
begin
|
||||
Process.kill signal, th.pid
|
||||
rescue Errno::ESRCH
|
||||
10.times do
|
||||
begin
|
||||
Process.kill signal, th.pid
|
||||
break
|
||||
rescue Errno::ESRCH
|
||||
break
|
||||
rescue Errno::EPERM # on Windows
|
||||
sleep 0.1
|
||||
retry
|
||||
end
|
||||
end
|
||||
th.join
|
||||
end
|
||||
|
@ -296,9 +303,16 @@ module DRbAry
|
|||
signal = /mswin|mingw/ =~ RUBY_PLATFORM ? :KILL : :TERM
|
||||
Thread.list.each {|th|
|
||||
if th.respond_to?(:pid) && th[:drb_service] == @service_name
|
||||
begin
|
||||
Process.kill signal, th.pid
|
||||
rescue Errno::ESRCH
|
||||
10.times do
|
||||
begin
|
||||
Process.kill signal, th.pid
|
||||
break
|
||||
rescue Errno::ESRCH
|
||||
break
|
||||
rescue Errno::EPERM # on Windows
|
||||
sleep 0.1
|
||||
retry
|
||||
end
|
||||
end
|
||||
th.join
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue