Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.0.X] Fixed #9031 -- Clarified the error message when the label used to run a specific test case method doesn't name a valid test case class. Thanks to Thomas Guettler for the suggestion and patch.

Browse Source 
Merge of r9879 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9880 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2009-02-22 08:38:42 +00:00
parent 3c48d866f6
commit ef66773cef
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
django/test/simple.py
View File

@ -7,7 +7,7 @@ from django.test.testcases import OutputChecker, DocTestRunner
# The module name for tests outside models.py # The module name for tests outside models.py
TEST_MODULE = 'tests' TEST_MODULE = 'tests'
doctestOutputChecker = OutputChecker() doctestOutputChecker = OutputChecker()
def get_tests(app_module): def get_tests(app_module):
@ -25,7 +25,7 @@ def get_tests(app_module):
# 'tests' module doesn't exist. Move on. # 'tests' module doesn't exist. Move on.
test_module = None test_module = None
else: else:
# The module exists, so there must be an import error in the # The module exists, so there must be an import error in the
# test module itself. We don't need the module; so if the # test module itself. We don't need the module; so if the
# module was a single file module (i.e., tests.py), close the file # module was a single file module (i.e., tests.py), close the file
# handle returned by find_module. Otherwise, the test module # handle returned by find_module. Otherwise, the test module
@ -34,11 +34,11 @@ def get_tests(app_module):
mod[0].close() mod[0].close()
raise raise
return test_module return test_module
def build_suite(app_module): def build_suite(app_module):
"Create a complete Django test suite for the provided application module" "Create a complete Django test suite for the provided application module"
suite = unittest.TestSuite() suite = unittest.TestSuite()
# Load unit and doctests in the models.py module. If module has # Load unit and doctests in the models.py module. If module has
# a suite() method, use it. Otherwise build the test suite ourselves. # a suite() method, use it. Otherwise build the test suite ourselves.
if hasattr(app_module, 'suite'): if hasattr(app_module, 'suite'):
@ -52,8 +52,8 @@ def build_suite(app_module):
except ValueError: except ValueError:
# No doc tests in models.py # No doc tests in models.py
pass pass
# Check to see if a separate 'tests' module exists parallel to the # Check to see if a separate 'tests' module exists parallel to the
# models module # models module
test_module = get_tests(app_module) test_module = get_tests(app_module)
if test_module: if test_module:
@ -63,8 +63,8 @@ def build_suite(app_module):
suite.addTest(test_module.suite()) suite.addTest(test_module.suite())
else: else:
suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(test_module)) suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(test_module))
try: try:
suite.addTest(doctest.DocTestSuite(test_module, suite.addTest(doctest.DocTestSuite(test_module,
checker=doctestOutputChecker, checker=doctestOutputChecker,
runner=DocTestRunner)) runner=DocTestRunner))
except ValueError: except ValueError:
@ -73,15 +73,15 @@ def build_suite(app_module):
return suite return suite
def build_test(label): def build_test(label):
"""Construct a test case a test with the specified label. Label should """Construct a test case a test with the specified label. Label should
be of the form model.TestClass or model.TestClass.test_method. Returns be of the form model.TestClass or model.TestClass.test_method. Returns
an instantiated test or test suite corresponding to the label provided. an instantiated test or test suite corresponding to the label provided.
""" """
parts = label.split('.') parts = label.split('.')
if len(parts) < 2 or len(parts) > 3: if len(parts) < 2 or len(parts) > 3:
raise ValueError("Test label '%s' should be of the form app.TestCase or app.TestCase.test_method" % label) raise ValueError("Test label '%s' should be of the form app.TestCase or app.TestCase.test_method" % label)
app_module = get_app(parts[0]) app_module = get_app(parts[0])
TestClass = getattr(app_module, parts[1], None) TestClass = getattr(app_module, parts[1], None)
@ -95,8 +95,10 @@ def build_test(label):
try: try:
return unittest.TestLoader().loadTestsFromTestCase(TestClass) return unittest.TestLoader().loadTestsFromTestCase(TestClass)
except TypeError: except TypeError:
raise ValueError("Test label '%s' does not refer to a test class" % label) raise ValueError("Test label '%s' does not refer to a test class" % label)
else: # label is app.TestClass.test_method else: # label is app.TestClass.test_method
if not TestClass:
raise ValueError("Test label '%s' does not refer to a test class" % label)
return TestClass(parts[2]) return TestClass(parts[2])
def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]): def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]):
@ -112,17 +114,17 @@ def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]):
When looking for tests, the test runner will look in the models and When looking for tests, the test runner will look in the models and
tests modules for the application. tests modules for the application.
A list of 'extra' tests may also be provided; these tests A list of 'extra' tests may also be provided; these tests
will be added to the test suite. will be added to the test suite.
Returns the number of tests that failed. Returns the number of tests that failed.
""" """
setup_test_environment() setup_test_environment()
settings.DEBUG = False settings.DEBUG = False
suite = unittest.TestSuite() suite = unittest.TestSuite()
if test_labels: if test_labels:
for label in test_labels: for label in test_labels:
if '.' in label: if '.' in label:
@ -133,7 +135,7 @@ def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]):
else: else:
for app in get_apps(): for app in get_apps():
suite.addTest(build_suite(app)) suite.addTest(build_suite(app))
for test in extra_tests: for test in extra_tests:
suite.addTest(test) suite.addTest(test)
@ -142,7 +144,7 @@ def run_tests(test_labels, verbosity=1, interactive=True, extra_tests=[]):
connection.creation.create_test_db(verbosity, autoclobber=not interactive) connection.creation.create_test_db(verbosity, autoclobber=not interactive)
result = unittest.TextTestRunner(verbosity=verbosity).run(suite) result = unittest.TextTestRunner(verbosity=verbosity).run(suite)
connection.creation.destroy_test_db(old_name, verbosity) connection.creation.destroy_test_db(old_name, verbosity)
teardown_test_environment() teardown_test_environment()
return len(result.failures) + len(result.errors) return len(result.failures) + len(result.errors)