Changeset 8238

Timestamp:

08/08/08 13:48:18 (4 months ago)

Author:

jacob

Message:

Fixed #8047: property detect an external database backend and set sys.path accordingly. Patch from Leo Soto.

Files:

• django/trunk/tests/regressiontests/admin_scripts/tests.py (modified) (2 diffs)

django/trunk/tests/regressiontests/admin_scripts/tests.py

@@ -68 +68 @@
-            return sys.executable
-
+    def _ext_backend_path(self):
+        """
+        Returns the path for the external backend package, or None if no
+        external backend is detected.
+        """
+        first_package_re = re.compile(r'(^[^\.]+)\.')
+        result = first_package_re.findall(settings.DATABASE_ENGINE)
+        if result:
+            backend_pkg = __import__(result[0])
+            backend_dir = os.path.dirname(backend_pkg.__file__)
+            return os.path.dirname(backend_dir)
-    def run_test(self, script, args, settings_file=None, apps=None):
-        test_dir = os.path.dirname(os.path.dirname(__file__))
-        project_dir = os.path.dirname(test_dir)
-        base_dir = os.path.dirname(project_dir)
+        ext_backend_base_dir = self._ext_backend_path()
-
-        # Remember the old environment
@@ -83 +95 @@
-        elif 'DJANGO_SETTINGS_MODULE' in os.environ:
-            del os.environ['DJANGO_SETTINGS_MODULE']
-    
-old_python_path
-os.environ['PYTHONPATH'] = os.pathsep.join([test_dir, base_dir, old_python_path]
-else:
-
+python_path = [test_dir, base_dir]
+ext_backend_base_dir
+python_path.append(ext_backend_base_dir
+os.environ['PYTHONPATH'] = os.pathsep.join(python_path)
+
-
-        # Build the command line