summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-12 00:24:40 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-12 00:24:40 +0000
commit178bc9a0e797d7c09a74a6edec525bda314cc575 (patch)
tree17af8123b4cfb135b24bdb549f967de8b8bc2a72 /test
parent8980a9b47bcb3690d646e189c98b16bc7a6a7733 (diff)
* test/lib/test/unit.rb: Hide skips by default.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47889 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/lib/test/unit.rb1
-rw-r--r--test/testunit/test_hideskip.rb2
-rw-r--r--test/testunit/test_sorting.rb2
3 files changed, 3 insertions, 2 deletions
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)