summaryrefslogtreecommitdiff
path: root/test/testunit
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-27 04:16:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-27 04:16:44 +0000
commitde1219686595c2a3cde16c7dc6ac8643a1d8b340 (patch)
tree2cd42e72ab19e3006db525807c83539c1a9c8997 /test/testunit
parent9c55cb2e9ebbe5366f3f1e7e3c63d64f860fc0a7 (diff)
test/unit: fix for the test
* test/lib/test/unit.rb (_run_parallel): make sure retrying message is a separate line. * test/lib/test/unit.rb (_prepare_run): do not add Output if testing. * test/lib/test/unit.rb (Skipping#failed): defer showing reports when showing skips, to be sorted. * test/testunit/test_hideskip.rb (test_hideskip): fix assertion for output misordered by mixing output destinations. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53955 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/testunit')
-rw-r--r--test/testunit/test_hideskip.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/testunit/test_hideskip.rb b/test/testunit/test_hideskip.rb
index a8d7b55..ed91200 100644
--- a/test/testunit/test_hideskip.rb
+++ b/test/testunit/test_hideskip.rb
@@ -3,9 +3,9 @@ require 'test/unit'
class TestHideSkip < Test::Unit::TestCase
def test_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"))
+ assert_not_match(/^ *1\) Skipped/, hideskip)
+ assert_match(/^ *1\) Skipped/, hideskip("--show-skip"))
+ assert_match(/assertions\/s.\n+1 tests, 0 assertions, 0 failures, 0 errors, 1 skips/, hideskip("--hide-skip"))
end
def hideskip(*args)