Browse files

Fixed discovery of the Django installation during tests.

If Django was symlinked into site-packages the previous approach to discover
the tests subdirectory would fail. The revised version now always points to
the location of the source and not the import path.
  • Loading branch information...
1 parent 0fe11fc commit 33234aa8f718a4fd7a1535416cf4593414b60a13 @apollo13 apollo13 committed Feb 26, 2013
Showing with 6 additions and 3 deletions.
  1. +6 −3 tests/admin_scripts/
@@ -106,9 +106,12 @@ def _ext_backend_paths(self):
def run_test(self, script, args, settings_file=None, apps=None):
project_dir = test_dir
base_dir = os.path.dirname(test_dir)
- import django
- django_dir = os.path.dirname(os.path.dirname(django.__file__))
- tests_dir = os.path.join(django_dir, 'tests')
+ # The base dir for Django's tests is one level up.
+ tests_dir = os.path.dirname(os.path.dirname(__file__))
+ # The base dir for Django is one level above the test dir. We don't use
+ # `import django` to figure that out, so we don't pick up a Django
+ # from site-packages or similar.
+ django_dir = os.path.dirname(tests_dir)
ext_backend_base_dirs = self._ext_backend_paths()
# Remember the old environment

0 comments on commit 33234aa

Please sign in to comment.