diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-01-19 01:14:02 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-01-19 01:14:02 +0000 |
| commit | e2d094b8fbb67b9d2a44fc107cd2c9bb3ac91990 (patch) | |
| tree | 775ced467eee126c5a324178c79cd336bce2c1e3 | |
| parent | 9aba6f807ebaa4aca9885142ce2d6f5e162cb8cd (diff) | |
Fixed #12640 -- Corrected a regression in test suite construction order introduced by #12255. Also updated the docs to reflect what the test code has always done. Thanks to Ramiro Morales for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12261 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | django/test/simple.py | 10 | ||||
| -rw-r--r-- | docs/topics/testing.txt | 6 | ||||
| -rw-r--r-- | tests/modeltests/model_package/tests.py | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/django/test/simple.py b/django/test/simple.py index 064193daa0..a11759e4e1 100644 --- a/django/test/simple.py +++ b/django/test/simple.py @@ -124,9 +124,9 @@ def build_suite(app_module): return suite def build_test(label): - """Construct a test case a test with the specified label. Label should - be of the form model.TestClass or model.TestClass.test_method. Returns - an instantiated test or test suite corresponding to the label provided. + """Construct a test case with the specified label. Label should be of the + form model.TestClass or model.TestClass.test_method. Returns an + instantiated test or test suite corresponding to the label provided. """ parts = label.split('.') @@ -271,10 +271,10 @@ class DjangoTestSuiteRunner(object): """ self.setup_test_environment() - old_names = self.setup_databases() - suite = self.build_suite(test_labels, extra_tests) + old_names = self.setup_databases() + result = self.run_suite(suite) self.teardown_databases(old_names) diff --git a/docs/topics/testing.txt b/docs/topics/testing.txt index f5098d9584..0b205cee35 100644 --- a/docs/topics/testing.txt +++ b/docs/topics/testing.txt @@ -1233,14 +1233,14 @@ testing behavior. This behavior involves: #. Performing global pre-test setup. + #. Looking for unit tests and doctests in the ``models.py`` and + ``tests.py`` files in each installed application. + #. Creating the test databases. #. Running ``syncdb`` to install models and initial data into the test databases. - #. Looking for unit tests and doctests in the ``models.py`` and - ``tests.py`` files in each installed application. - #. Running the unit tests and doctests that are found. #. Destroying the test databases. diff --git a/tests/modeltests/model_package/tests.py b/tests/modeltests/model_package/tests.py index 4d154c14fa..7d2a063cc9 100644 --- a/tests/modeltests/model_package/tests.py +++ b/tests/modeltests/model_package/tests.py @@ -37,7 +37,7 @@ __test__ = {'API_TESTS': """ >>> a.sites.count() 1 -# Regression for #12248 - Models can exist in the test package, too +# Regression for #12245 - Models can exist in the test package, too >>> ad = Advertisment(customer="Lawrence Journal-World") >>> ad.save() |