Ticket #12658: patch+tests.diff

webserver/lib/django-1.3/django/test/simple.py

@@ -38 +38 @@
     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.
+        # app_module either points to a models.py file, or models/__init__.py
+        # Tests are therefore either in same directory, or one level up
+        from django.utils.module_loading import module_has_submodule
+        if app_module.__name__.split('.')[-1] == 'models':
+            root_name = '.'.join(app_module.__name__.split('.')[:-1])
+            __import__(root_name)
+            app_root = sys.modules[root_name]
+        else:
+            app_root = app_module
+
+        if not module_has_submodule(app_root, 'tests'):
             test_module = None
+            
         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., tests.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()
+            # test module itself. 
             raise
     return test_module
 

new file webserver/lib/django-1.3/tests/regressiontests/invalid_tests_importerror/__init__.py

@@ +1 @@
+# Example of directory model & test layout that causes issue #12658
+# The tests raise an ImportError so this test is marked as invalid

new file webserver/lib/django-1.3/tests/regressiontests/invalid_tests_importerror/tests/__init__.py

@@ +1 @@
+# Tests that raise ImportError should not fail silently.
+# This is a support fixture for test_get_tests
+raise ImportError

new file webserver/lib/django-1.3/tests/regressiontests/test_get_tests/tests.py

@@ +1 @@
+import sys
+
+from django.core.exceptions import ImproperlyConfigured
+from django.test import simple
+from django.utils import unittest
+from django.test.simple import get_tests
+from django.db.models.loading import get_app
+
+TEST_APP_OK = 'test_model_and_tests_package.models'
+TEST_APP_ERROR = 'invalid_tests_importerror.models'
+
+def load_test_app(name):
+    """Load a non-registered app in a sibling directory to this test"""
+    path = __package__.split('.')[:-1]
+    name = '.'.join(path+[name])
+    __import__(name)
+    return sys.modules[name]
+
+class GetTestTests(unittest.TestCase):
+    def test_get_tests(self):
+        "Check we can find tests in directory"
+        module = load_test_app(TEST_APP_OK)
+        tests = get_tests(module)
+        self.assert_(isinstance(tests, type(module)))
+            
+    def test_import_error(self):
+        "Test for #12658 - tests with importerrors fail silently"
+        module = load_test_app(TEST_APP_ERROR)
+        self.assertRaises(ImportError, get_tests, module)
+

new file webserver/lib/django-1.3/tests/regressiontests/test_model_and_tests_package/__init__.py

@@ +1 @@
+# Example of directory model & test layout that causes issue #12658