summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--test/lib/test/unit.rb1
-rw-r--r--test/testunit/test_hideskip.rb2
-rw-r--r--test/testunit/test_sorting.rb2
4 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 56393f57e1..84c1b71388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Oct 12 09:24:15 2014 Tanaka Akira <akr@fsij.org>
+
+ * test/lib/test/unit.rb: Hide skips by default.
+
Sun Oct 12 01:37:11 2014 Yuki Yugui Sonoda <yugui@yugui.jp>
* file.c: include sys/time.h only if HAVE_SYS_TIME_H
diff --git a/test/lib/test/unit.rb b/test/lib/test/unit.rb
index 2b52eefa49..c4fdf6713f 100644
--- a/test/lib/test/unit.rb
+++ b/test/lib/test/unit.rb
@@ -76,6 +76,7 @@ module Test
options[:retry] = true
options[:job_status] = nil
+ options[:hide_skip] = true
opts.on '-h', '--help', 'Display this help.' do
puts opts
diff --git a/test/testunit/test_hideskip.rb b/test/testunit/test_hideskip.rb
index a7dac42bd7..e696b5e1df 100644
--- a/test/testunit/test_hideskip.rb
+++ b/test/testunit/test_hideskip.rb
@@ -2,7 +2,7 @@ require 'test/unit'
class TestHideSkip < Test::Unit::TestCase
def test_hideskip
- assert_match(/assertions\/s.\n\n 1\) Skipped/, hideskip)
+ assert_not_match(/assertions\/s.\n\n 1\) Skipped/, hideskip)
assert_match(/assertions\/s.\n\n 1\) Skipped/, hideskip("--show-skip"))
assert_match(/assertions\/s.\n\n1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, hideskip("--hide-skip"))
end
diff --git a/test/testunit/test_sorting.rb b/test/testunit/test_sorting.rb
index 96348dd172..e13ca1fec6 100644
--- a/test/testunit/test_sorting.rb
+++ b/test/testunit/test_sorting.rb
@@ -2,7 +2,7 @@ require 'test/unit'
class TestTestUnitSorting < Test::Unit::TestCase
def test_sorting
- result = sorting
+ result = sorting("--show-skip")
assert_match(/^ 1\) Skipped:/, result)
assert_match(/^ 2\) Failure:/, result)
assert_match(/^ 3\) Error:/, result)