Ticket #6712: svn.diff

django/test/simple.py

@@ -73 +73 @@
                 pass
     return suite
 
+def _get_all_tests_from_suite(suite):
+    """Explore suite recursively to get _all_ tests in it
+    """
+    if isinstance(suite,unittest.TestCase):
+        return [suite]
+    else:
+        all_tests = []
+        [all_tests.extend(_get_all_tests_from_suite(sub_suite)) for sub_suite in getattr(suite,'_tests',[])]
+        return all_tests
+
 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
@@ -92 +102 @@
         if test_module:
             TestClass = getattr(test_module, parts[1], None)
 
+    # Couldn't find the test class; look in test suite
+    if TestClass is None:
+        suite = build_suite(app_module)
+        all_tests = _get_all_tests_from_suite(suite)
+        for test_in_suite in all_tests:
+            if test_in_suite.__class__.__name__ == parts[1]:
+                TestClass = test_in_suite.__class__
+                break
+
     if len(parts) == 2: # label is app.TestClass
         try:
             return unittest.TestLoader().loadTestsFromTestCase(TestClass)