mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #12932 -- Added an extra argument to suite_result() in the test runner, and added **kwargs as protection against future changes. Thanks to Eric Holscher for the report and patch.

Browse Source 
This is BACKWARDS INCOMPATIBLE for anyone that has written a custom DjangoTestRunner class since it was introduced in r12255.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee
2010-02-22 12:34:52 +00:00
parent a9b2ac25d1
commit 2fc19d8d6f
2 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
django/test/simple.py
View File

@@ -232,16 +232,16 @@ def reorder_suite(suite, classes):
class DjangoTestSuiteRunner(object):
def __init__(self, verbosity=1, interactive=True, failfast=True):
def __init__(self, verbosity=1, interactive=True, failfast=True, **kwargs):
self.verbosity = verbosity
self.interactive = interactive
self.failfast = failfast
def setup_test_environment(self):
def setup_test_environment(self, **kwargs):
setup_test_environment()
settings.DEBUG = False
def build_suite(self, test_labels, extra_tests=None):
def build_suite(self, test_labels, extra_tests=None, **kwargs):
suite = unittest.TestSuite()
if test_labels:
@@ -261,7 +261,7 @@ class DjangoTestSuiteRunner(object):
return reorder_suite(suite, (TestCase,))
def setup_databases(self):
def setup_databases(self, **kwargs):
from django.db import connections
old_names = []
mirrors = []
@@ -278,10 +278,10 @@ class DjangoTestSuiteRunner(object):
connection.creation.create_test_db(self.verbosity, autoclobber=not self.interactive)
return old_names, mirrors
def run_suite(self, suite):
def run_suite(self, suite, **kwargs):
return DjangoTestRunner(verbosity=self.verbosity, failfast=self.failfast).run(suite)
def teardown_databases(self, old_config):
def teardown_databases(self, old_config, **kwargs):
from django.db import connections
old_names, mirrors = old_config
# Point all the mirrors back to the originals
@@ -291,13 +291,13 @@ class DjangoTestSuiteRunner(object):
for connection, old_name in old_names:
connection.creation.destroy_test_db(old_name, self.verbosity)
def teardown_test_environment(self):
def teardown_test_environment(self, **kwargs):
teardown_test_environment()
def suite_result(self, result):
def suite_result(self, suite, result, **kwargs):
return len(result.failures) + len(result.errors)
def run_tests(self, test_labels, extra_tests=None):
def run_tests(self, test_labels, extra_tests=None, **kwargs):
"""
Run the unit tests for all the test labels in the provided list.
Labels must be of the form:
@@ -322,7 +322,7 @@ class DjangoTestSuiteRunner(object):
result = self.run_suite(suite)
self.teardown_databases(old_config)
self.teardown_test_environment()
return self.suite_result(result)
return self.suite_result(suite, result)
def run_tests(test_labels, verbosity=1, interactive=True, failfast=False, extra_tests=None):
import warnings