Ticket #8010: django-management-test_multiple-testcases-per-model.2.patch

django/test/simple.py

@@ -1 +1 @@
 import unittest
+import os.path
+import glob
+from imp import find_module
 from django.conf import settings
 from django.db.models import get_app, get_apps
 from django.test import _doctest as doctest
@@ -11 +14 @@
 doctestOutputChecker = OutputChecker()
 
 def get_tests(app_module):
-    try:
-        app_path = app_module.__name__.split('.')[:-1]
-        test_module = __import__('.'.join(app_path + [TEST_MODULE]), {}, {}, TEST_MODULE)
-    except ImportError, e:
-        # Couldn't import tests.py. Was it due to a missing file, or
-        # due to an import error in a tests.py that actually exists?
-        import os.path
-        from imp import find_module
+    "Collect test cases for the provided application module"
+    def _find_module(module_name, path):
         try:
-            mod = find_module(TEST_MODULE, [os.path.dirname(app_module.__file__)])
+            mod = find_module(module_name, path)
         except ImportError:
             # 'tests' module doesn't exist. Move on.
-            test_module = None
+            pass
         else:
             # The module exists, so there must be an import error in the
             # test module itself. We don't need the module; so if the
@@ -33 +30 @@
             if mod[0]:
                 mod[0].close()
             raise
-    return test_module
 
+    # Going to collect modules with test cases and return them at once.
+    test_module_list = []
+    try:
+        app_path = app_module.__name__.split('.')[:-1]
+        test_module = __import__('.'.join(app_path + [TEST_MODULE]), {}, {}, TEST_MODULE)
+        test_module_list.append(test_module)
+    except ImportError, e:
+        # Couldn't import tests.py. Was it due to a missing file, or
+        # due to an import error in a tests.py that actually exists?
+        _find_module(TEST_MODULE, [os.path.dirname(app_module.__file__)])
+
+    # Search for separate files inside the tests/ directory.
+    app_full_path = os.path.abspath(os.path.join(app_module.__file__, os.pardir))
+    glob_pattern = os.path.join(app_full_path, TEST_MODULE, settings.TEST_MODULES_GLOB)
+    for test_filename in glob.glob(glob_pattern):
+        module_name, _ext = os.path.splitext(os.path.basename(test_filename))
+        try:
+            test_module_path = '.'.join(app_path + [TEST_MODULE, module_name])
+            test_module = __import__(test_module_path, {}, {}, module_name)
+            test_module_list.append(test_module)
+        except ImportError, e:
+            # Couldn't import test module. Was it due to a missing file, or
+            # due to an import error in a test module that actually exists?
+            _find_module(module_name, [os.path.join(os.path.dirname(app_module.__file__, TEST_MODULE))])
+
+    # Return collected modules.
+    return test_module_list
+
 def build_suite(app_module):
     "Create a complete Django test suite for the provided application module"
     suite = unittest.TestSuite()
 
     # Load unit and doctests in the models.py module. If module has
     # a suite() method, use it. Otherwise build the test suite ourselves.
-    if hasattr(app_module, 'suite'):
-        suite.addTest(app_module.suite())
-    else:
-        suite.addTest(unittest.defaultTestLoader.loadTestsFromModule(app_module))
-        try:
-            suite.addTest(doctest.DocTestSuite(app_module,
-                                               checker=doctestOutputChecker,
-                                               runner=DocTestRunner))
-        except ValueError:
-            # No doc tests in models.py
-            pass
-
     # Check to see if a separate 'tests' module exists parallel to the
-    # models module
-    test_module = get_tests(app_module)
-    if test_module:
-        # Load unit and doctests in the tests.py module. If module has
+    # models module.
+    for test_module in [app_module] + get_tests(app_module):
+        # Load unit and doctests in the models.py and test modules. If module has
         # a suite() method, use it. Otherwise build the test suite ourselves.
         if hasattr(test_module, 'suite'):
             suite.addTest(test_module.suite())
@@ -68 +79 @@
                                                    checker=doctestOutputChecker,
                                                    runner=DocTestRunner))
             except ValueError:
-                # No doc tests in tests.py
+                # No doctests in the module
                 pass
     return suite
 
@@ -85 +96 @@
     app_module = get_app(parts[0])
     TestClass = getattr(app_module, parts[1], None)
 
-    # Couldn't find the test class in models.py; look in tests.py
+    # Couldn't find the test class in models.py; look in test modules
     if TestClass is None:
-        test_module = get_tests(app_module)
-        if test_module:
+        for test_module in get_tests(app_module):
             TestClass = getattr(test_module, parts[1], None)
+            if TestClass is not None:
+                break
 
     if len(parts) == 2: # label is app.TestClass
         try:

django/conf/global_settings.py

@@ -392 +392 @@
 TEST_DATABASE_CHARSET = None
 TEST_DATABASE_COLLATION = None
 
+# The default naming convetions for files containing test cases for them 
+# to be automatically imported from the (hardcoded) tests/ directory.
+TEST_MODULES_GLOB = 'test_*.py'
+
 ############
 # FIXTURES #
 ############