Ticket #11627: test_suite.1.diff

django/test/simple.py

@@ -44 +44 @@
     if hasattr(app_module, 'suite'):
         suite.addTest(app_module.suite())
     else:
-        suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(app_module))
+        suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(app_module))                       
         try:
             suite.addTest(doctest.DocTestSuite(app_module,
                                                checker=doctestOutputChecker,
@@ -82 +82 @@
     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)
 
-    app_module = get_app(parts[0])
-    TestClass = getattr(app_module, parts[1], None)
+    module = get_app(parts[0])
+    TestClass = getattr(module, parts[1], None)
 
     # Couldn't find the test class in models.py; look in tests.py
     if TestClass is None:
-        test_module = get_tests(app_module)
-        if test_module:
-            TestClass = getattr(test_module, parts[1], None)
+        module = get_tests(module)
+        if module:
+            TestClass = getattr(module, parts[1], None)
 
     if len(parts) == 2: # label is app.TestClass
         try:
-            return unittest.TestLoader().loadTestsFromTestCase(TestClass)
+            # retrieves tests from either a TestCase or TestSuite
+            return unittest.TestLoader().loadTestsFromName(parts[1], module)
         except TypeError:
             raise ValueError("Test label '%s' does not refer to a test class" % label)
     else: # label is app.TestClass.test_method

django/test/testcases.py

@@ -460 +460 @@
         transaction.rollback()
         transaction.leave_transaction_management()
         connection.close()
+
+class TestSuite(unittest.TestSuite):
+        pass

django/test/__init__.py

@@ -3 +3 @@
 """
 
 from django.test.client import Client
-from django.test.testcases import TestCase, TransactionTestCase
+from django.test.testcases import TestCase, TransactionTestCase, TestSuite