Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_runner: Support continuing running tests after a failure.

This commit is contained in:
Tim Abbott 2016-01-23 14:18:26 -08:00
parent b43aadad8b
commit f9791558e9
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/test-backend
View File

@ -16,6 +16,8 @@ if __name__ == "__main__":
django.setup() django.setup()
parser = optparse.OptionParser() parser = optparse.OptionParser()
parser.add_option('--nonfatal-errors', action="store_false", default=True,
dest="fatal_errors", help="Continue past test failures to run all tests")
parser.add_option('--coverage', dest='coverage', parser.add_option('--coverage', dest='coverage',
action="store_true", action="store_true",
default=False, help='Compute test coverage.') default=False, help='Compute test coverage.')
@ -33,7 +35,7 @@ if __name__ == "__main__":
TestRunner = get_runner(settings) TestRunner = get_runner(settings)
test_runner = TestRunner() test_runner = TestRunner()
failures = test_runner.run_tests(suites) failures = test_runner.run_tests(suites, fatal_errors=options.fatal_errors)
if options.coverage: if options.coverage:
cov.stop() cov.stop()

21
zerver/lib/test_runner.py
View File

@ -6,9 +6,9 @@ from zerver.views.messages import get_sqlalchemy_connection
import os import os
import time import time
import traceback
import unittest import unittest
def slow(expected_run_time, slowness_reason): def slow(expected_run_time, slowness_reason):
''' '''
This is a decorate that annotates a test as being "known This is a decorate that annotates a test as being "known
@ -53,6 +53,7 @@ def fast_tests_only():
return os.environ.get('FAST_TESTS_ONLY', False) return os.environ.get('FAST_TESTS_ONLY', False)
def run_test(test): def run_test(test):
failed = False
test_method = get_test_method(test) test_method = get_test_method(test)
if fast_tests_only() and is_known_slow_test(test_method): if fast_tests_only() and is_known_slow_test(test_method):
@ -76,20 +77,30 @@ def run_test(test):
test_method() test_method()
except unittest.SkipTest: except unittest.SkipTest:
pass pass
except Exception:
failed = True
traceback.print_exc()
test.tearDown() test.tearDown()
delay = time.time() - start_time delay = time.time() - start_time
enforce_timely_test_completion(test_method, test_name, delay) enforce_timely_test_completion(test_method, test_name, delay)
test._post_teardown() test._post_teardown()
return failed
class Runner(DiscoverRunner): class Runner(DiscoverRunner):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
DiscoverRunner.__init__(self, *args, **kwargs) DiscoverRunner.__init__(self, *args, **kwargs)
def run_suite(self, suite): def run_suite(self, suite, fatal_errors=None):
failed = False
for test in suite: for test in suite:
run_test(test) if run_test(test):
failed = True
if fatal_errors:
return failed
return failed
def run_tests(self, test_labels, extra_tests=None, **kwargs): def run_tests(self, test_labels, extra_tests=None, **kwargs):
self.setup_test_environment() self.setup_test_environment()
@ -98,7 +109,7 @@ class Runner(DiscoverRunner):
# run a single test and getting an SA connection causes data from # run a single test and getting an SA connection causes data from
# a Django connection to be rolled back mid-test. # a Django connection to be rolled back mid-test.
get_sqlalchemy_connection() get_sqlalchemy_connection()
self.run_suite(suite) failed = self.run_suite(suite, fatal_errors=kwargs.get('fatal_errors'))
self.teardown_test_environment() self.teardown_test_environment()
print('DONE!') return failed
print() print()