summaryrefslogtreecommitdiff
path: root/bin/run_tests
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-02-01 17:02:52 -0800
committerelijah <elijah@riseup.net>2016-02-01 17:02:52 -0800
commitedc9aa13f5ebb07f27e73fd4befc5fbbadfebc66 (patch)
treec2b603c6f21cb307828cefb94e345e28b046db78 /bin/run_tests
parente244e724c40c5f4770a43721e4c7441dec242e4f (diff)
tests: added --timeout to run_tests (default 30 seconds). test halts and fails after timeout is reached. closes #7806
Diffstat (limited to 'bin/run_tests')
-rwxr-xr-xbin/run_tests35
1 files changed, 28 insertions, 7 deletions
diff --git a/bin/run_tests b/bin/run_tests
index fc668ad6..4cb652db 100755
--- a/bin/run_tests
+++ b/bin/run_tests
@@ -14,6 +14,7 @@
require 'minitest/unit'
require 'yaml'
require 'tsort'
+require 'timeout'
##
## CONSTANTS
@@ -115,6 +116,16 @@ class LeapTest < MiniTest::Unit::TestCase
end
#
+ # thrown Timeout::Error if test run
+ # takes longer than $timeout
+ #
+ def run(*args)
+ Timeout::timeout($timeout, Timeout::Error) do
+ super(*args)
+ end
+ end
+
+ #
# The default pass just does an `assert true`. In our case, we want to make the passes more explicit.
#
def pass
@@ -144,6 +155,7 @@ class LeapTest < MiniTest::Unit::TestCase
MiniTest::Unit.runner.warn(self.class, method_name, msg.join("\n"))
end
+ #
# Always runs test methods within a test class in alphanumeric order
#
def self.test_order
@@ -218,6 +230,12 @@ class LeapRunner < MiniTest::Unit
if $halt_on_failure
raise TestFailure.new
end
+ when Timeout::Error then
+ @failures += 1
+ report_line("TIMEOUT", klass, meth, nil, "Test stopped because timeout exceeded (#{$timeout} seconds).")
+ if $halt_on_failure
+ raise TestFailure.new
+ end
else
@errors += 1
bt = MiniTest::filter_backtrace(e.backtrace).join "\n"
@@ -371,13 +389,14 @@ end
def print_help
puts ["USAGE: run_tests [OPTIONS]",
- " --continue Don't halt on an error, but continue to the next test.",
- " --checkmk Print test results in checkmk format (must come before --test).",
- " --test TEST Run only the test with name TEST.",
- " --list-tests Prints the names of all available tests and exit.",
- " --retry COUNT If the tests don't pass, retry COUNT additional times (default is zero)",
- " --wait SECONDS Wait for SECONDS between retries (default is 5)",
- " --debug Print out full stack trace on errors"].join("\n")
+ " --continue Don't halt on an error, but continue to the next test.",
+ " --checkmk Print test results in checkmk format (must come before --test).",
+ " --test TEST Run only the test with name TEST.",
+ " --list-tests Prints the names of all available tests and exit.",
+ " --retry COUNT If the tests don't pass, retry COUNT additional times (default is zero).",
+ " --timeout SECONDS Halt a test if it exceed SECONDS (default is 30).",
+ " --wait SECONDS Wait for SECONDS between retries (default is 5).",
+ " --debug Print out full stack trace on errors."].join("\n")
exit(0)
end
@@ -455,6 +474,7 @@ def main
$output_format = :human
$retry = false
$wait = 5
+ $timeout = 30
loop do
case ARGV[0]
when '--continue' then ARGV.shift; $halt_on_failure = false;
@@ -463,6 +483,7 @@ def main
when '--test' then ARGV.shift; pin_test_name(ARGV.shift)
when '--list-tests' then list_tests
when '--retry' then ARGV.shift; $retry = ARGV.shift.to_i
+ when '--timeout' then ARGV.shift; $timeout = ARGV.shift.to_i;
when '--wait' then ARGV.shift; $wait = ARGV.shift.to_i
when '--debug' then ARGV.shift
when '-d' then ARGV.shift