Ticket #8010: django-management-test-multifile-tests.patch

django/test/simple.py

@@ -12 +12 @@
 doctestOutputChecker = OutputChecker()
 
 def get_tests(app_module):
+    import os.path
+    from imp import find_module
+    import glob
+
     try:
         app_path = app_module.__name__.split('.')[:-1]
         test_module = __import__('.'.join(app_path + [TEST_MODULE]), {}, {}, TEST_MODULE)
+        yield 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
         try:
             mod = find_module(TEST_MODULE, [os.path.dirname(app_module.__file__)])
         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
@@ -34 +37 @@
             if mod[0]:
                 mod[0].close()
             raise
-    return test_module
+
+    app_path = app_module.__name__.split('.')[:-1]
+    app_full_path = os.path.abspath(os.path.join(app_module.__file__, os.pardir))
+    for test_filename in glob.glob(os.path.join(app_full_path, TEST_MODULE, 'test_*.py')):
+        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)
+            yield 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?
+            try:
+                mod = find_module(module_name, [os.path.join(os.path.dirname(app_module.__file__, TEST_MODULE))])
+            except ImportError:
+                # 'tests' module doesn't exist. Move on.
+                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
+                # module was a single file module (i.e., test_*.py), close the file
+                # handle returned by find_module. Otherwise, the test module
+                # is a directory, and there is nothing to close.
+                if mod[0]:
+                    mod[0].close()
+                raise
     
 def build_suite(app_module):
     "Create a complete Django test suite for the provided application module"
@@ -56 +84 @@
     
     # 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
+    for test_module in get_tests(app_module):
+        # Load unit and doctests in 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())
@@ -69 +96 @@
                                                    checker=doctestOutputChecker,
                                                    runner=DocTestRunner))
             except ValueError:
-                # No doc tests in tests.py
+                # No doc tests in the test module
                 pass
     return suite
 
@@ -86 +113 @@
     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
-    if TestClass is None:
-        test_module = get_tests(app_module)
-        if test_module:
+    # Couldn't find the test class in models.py; look in test modules
+    while TestClass is None:
+        for test_module in get_tests(app_module):
             TestClass = getattr(test_module, parts[1], None)
 
     if len(parts) == 2: # label is app.TestClass