parent
d8dfff2ab0
commit
406eb43112
|
@ -293,13 +293,10 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse,
|
||||||
test_name_patterns, start_at, start_after, pdb, buffer,
|
test_name_patterns, start_at, start_after, pdb, buffer,
|
||||||
timing):
|
timing):
|
||||||
state = setup(verbosity, test_labels, parallel, start_at, start_after)
|
state = setup(verbosity, test_labels, parallel, start_at, start_after)
|
||||||
extra_tests = []
|
|
||||||
|
|
||||||
# Run the test suite, including the extra validation tests.
|
# Run the test suite, including the extra validation tests.
|
||||||
if not hasattr(settings, 'TEST_RUNNER'):
|
if not hasattr(settings, 'TEST_RUNNER'):
|
||||||
settings.TEST_RUNNER = 'django.test.runner.DiscoverRunner'
|
settings.TEST_RUNNER = 'django.test.runner.DiscoverRunner'
|
||||||
TestRunner = get_runner(settings)
|
TestRunner = get_runner(settings)
|
||||||
|
|
||||||
test_runner = TestRunner(
|
test_runner = TestRunner(
|
||||||
verbosity=verbosity,
|
verbosity=verbosity,
|
||||||
interactive=interactive,
|
interactive=interactive,
|
||||||
|
@ -315,10 +312,7 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse,
|
||||||
buffer=buffer,
|
buffer=buffer,
|
||||||
timing=timing,
|
timing=timing,
|
||||||
)
|
)
|
||||||
failures = test_runner.run_tests(
|
failures = test_runner.run_tests(test_labels or get_installed())
|
||||||
test_labels or get_installed(),
|
|
||||||
extra_tests=extra_tests,
|
|
||||||
)
|
|
||||||
teardown(state)
|
teardown(state)
|
||||||
return failures
|
return failures
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue