summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-21 02:23:21 +0000
committersorah <sorah@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-03-21 02:23:21 +0000
commit80b64d145a30613a7d357f9f942e5846c064ea0e (patch)
tree2db6323ad88eeb576a3997dba47d558b9c64942d
parent580f7c95a522eec6b9ea12ba81a02c76731154ad (diff)
* lib/test/unit.rb: Refactoring. Unified if and elsif.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/test/unit.rb9
2 files changed, 5 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 51ec41f603..1e06bdf886 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Mar 21 11:21:32 2011 Shota Fukumori <sorah@tubusu.net>
+
+ * lib/test/unit.rb: Refactoring. Unified if and elsif.
+
Sun Mar 20 23:09:34 2011 Tadayoshi Funaba <tadf@dotrb.org>
* ext/date/date_strftime.c: checks duplicated modifiers.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index a69c039cc3..099fcb0c14 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -487,20 +487,13 @@ module Test
end
end
- if @interrupt || @opts[:no_retry]
+ if @interrupt || @opts[:no_retry] || @need_quit
rep.each do |r|
report.push(*r[:report])
end
@errors += rep.map{|x| x[:result][0] }.inject(:+)
@failures += rep.map{|x| x[:result][1] }.inject(:+)
@skips += rep.map{|x| x[:result][2] }.inject(:+)
- elsif @need_quit
- rep.each do |r|
- report.push(*r[:report])
- @errors += r[:result][0]
- @failures += r[:result][1]
- @skips += r[:result][2]
- end
else
puts ""
puts "Retrying..."