1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test/unit.rb: restore parallel option

Browse Source 
* test/lib/test/unit.rb (_run_parallel): restore parallel option
  after retrying for --repeat-count option.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@57169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-12-24 09:22:21 +00:00
parent 52acc428f0
commit e4aac80a71
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/lib/test/unit.rb
View File

@ -445,6 +445,7 @@ module Test
quit_workers quit_workers
unless @interrupt || !@options[:retry] || @need_quit unless @interrupt || !@options[:retry] || @need_quit
parallel = @options[:parallel]
@options[:parallel] = false @options[:parallel] = false
suites, rep = rep.partition {|r| r[:testcase] && r[:file] && r[:report].any? {|e| !e[2].is_a?(MiniTest::Skip)}} suites, rep = rep.partition {|r| r[:testcase] && r[:file] && r[:report].any? {|e| !e[2].is_a?(MiniTest::Skip)}}
suites.map {|r| r[:file]}.uniq.each {|file| require file} suites.map {|r| r[:file]}.uniq.each {|file| require file}
@ -454,6 +455,7 @@ module Test
puts "\n""Retrying..." puts "\n""Retrying..."
_run_suites(suites, type) _run_suites(suites, type)
end end
@options[:parallel] = parallel
end end
unless @options[:retry] unless @options[:retry]
del_status_line or puts del_status_line or puts