Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fixed #8029 -- Modified admin_scripts test to use the PYTHONPATH from…

… the environment where the test is executed. Thanks to Ramiro and Alex Gaynor for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@8149 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 0dc11a0c1d92fc9c3d93056f0e307126ea13e9b2 1 parent 74dde43
Russell Keith-Magee authored July 30, 2008
5  tests/regressiontests/admin_scripts/tests.py
@@ -67,7 +67,10 @@ def run_test(self, script, args, settings_file=None, apps=None):
67 67
         elif 'DJANGO_SETTINGS_MODULE' in os.environ:
68 68
             del os.environ['DJANGO_SETTINGS_MODULE']
69 69
 
70  
-        os.environ['PYTHONPATH'] = os.pathsep.join([test_dir,base_dir])
  70
+        if old_python_path:
  71
+            os.environ['PYTHONPATH'] = os.pathsep.join([test_dir, base_dir, old_python_path])
  72
+        else:
  73
+            os.environ['PYTHONPATH'] = os.pathsep.join([test_dir, base_dir])
71 74
 
72 75
         # Move to the test directory and run
73 76
         os.chdir(test_dir)

0 notes on commit 0dc11a0

Please sign in to comment.
Something went wrong with that request. Please try again.