summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-04-13 02:36:47 -0700
committerelijah <elijah@riseup.net>2016-04-13 02:36:47 -0700
commit232047fdee815d9cf8c92b6853c5bc8039f2719c (patch)
tree0015bdab3cf8fc262f58c105f58bfad02a98ec1e
parent70a9b8a77caf50bc2458c3153526a189c024dea7 (diff)
test: ensure that checkmk always gets the same list of tests
-rwxr-xr-xbin/run_tests12
-rw-r--r--tests/white-box/couchdb.rb2
2 files changed, 13 insertions, 1 deletions
diff --git a/bin/run_tests b/bin/run_tests
index 5733f526..b6784ed5 100755
--- a/bin/run_tests
+++ b/bin/run_tests
@@ -82,6 +82,8 @@ end
class LeapTest < MiniTest::Unit::TestCase
class Pass < MiniTest::Assertion
end
+ class SilentPass < Pass
+ end
class Ignore < MiniTest::Assertion
end
@@ -133,6 +135,12 @@ class LeapTest < MiniTest::Unit::TestCase
end
#
+ # This is just like pass(), but the result is normally silent, unless `run_tests --test TEST`
+ def silent_pass
+ raise LeapTest::SilentPass
+ end
+
+ #
# Called when the test should be silently ignored.
#
def ignore
@@ -221,6 +229,10 @@ class LeapRunner < MiniTest::Unit
if @verbose
report_line("IGNORE", klass, meth, e, e.message)
end
+ when LeapTest::SilentPass then
+ if $pinned_test_method || $output_format == :checkmk
+ report_line("PASS", klass, meth)
+ end
when LeapTest::Pass then
@passes += 1
report_line("PASS", klass, meth)
diff --git a/tests/white-box/couchdb.rb b/tests/white-box/couchdb.rb
index 859b4745..85dc6840 100644
--- a/tests/white-box/couchdb.rb
+++ b/tests/white-box/couchdb.rb
@@ -151,7 +151,7 @@ class CouchDB < LeapTest
# either way, make sure we leave a db for the mx tests:
assert_create_user_db(user["id"], :username => 'admin')
end
- # no 'pass' at the end, since this is not a real test.
+ silent_pass
end
private