From e2d094b8fbb67b9d2a44fc107cd2c9bb3ac91990 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Tue, 19 Jan 2010 01:14:02 +0000 Subject: 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 --- django/test/simple.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'django') 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) -- cgit v1.3