summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-22 09:21:53 +0000
committerngoto <ngoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-22 09:21:53 +0000
commit05f78a6fd28519feb29e2ea9cd9d90601b08765c (patch)
tree0ae061bf011feb000e526c61af8992074e748989 /test
parentcc934fc31c221225584d8b33c1f4975fe39c4637 (diff)
* test/lib/test/unit.rb (Test::Unit::Parallel#start_watchdog): removed
because it has been meaningless since r36385. [Bug:11288] * test/lib/test/unit.rb (Test::Unit::Parallel#_run_parallel): delete lines related to the removed start_watchdog method git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/lib/test/unit.rb20
1 files changed, 0 insertions, 20 deletions
diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb
index 9d9ff4b..3c022b7 100644
--- a/test/lib/test/unit.rb
+++ b/test/lib/test/unit.rb
@@ -314,22 +314,6 @@ module Test
end
end
- def start_watchdog
- Thread.new do
- while stat = Process.wait2
- break if @interrupt # Break when interrupt
- pid, stat = stat
- w = (@workers + @dead_workers).find{|x| pid == x.pid }
- next unless w
- w = w.dup
- if w.status != :quit && !w.quit_called?
- # Worker down
- w.died(nil, !stat.signaled? && stat.exitstatus)
- end
- end
- end
- end
-
def deal(io, type, result, rep, shutting_down = false)
worker = @workers_hash[io]
cmd = worker.read
@@ -404,9 +388,6 @@ module Test
@workers_hash = {} # out-IO => worker
@ios = [] # Array of worker IOs
begin
- # Thread: watchdog
- watchdog = start_watchdog
-
@options[:parallel].times {launch_worker}
while _io = IO.select(@ios)[0]
@@ -420,7 +401,6 @@ module Test
@interrupt = ex
return result
ensure
- watchdog.kill if watchdog
if @interrupt
@ios.select!{|x| @workers_hash[x].status == :running }
while !@ios.empty? && (__io = IO.select(@ios,[],[],10))