innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Corrected a bug in [7876] picked up by the buildbot: depending on the order in which tests are run, some tests would fail because of a dependency on the current working directory. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2008-07-10 13:53:45 +00:00
parent 9376d4ed5b
commit e18fccc62e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/regressiontests/admin_scripts/tests.py
View File

@ -58,6 +58,7 @@ class AdminScriptTestCase(unittest.TestCase):
# Remember the old environment # Remember the old environment
old_django_settings_module = os.environ.get('DJANGO_SETTINGS_MODULE', None) old_django_settings_module = os.environ.get('DJANGO_SETTINGS_MODULE', None)
old_python_path = os.environ.get('PYTHONPATH', None) old_python_path = os.environ.get('PYTHONPATH', None)
old_cwd = os.getcwd()
# Set the test environment # Set the test environment
if settings_file: if settings_file:
@ -78,6 +79,9 @@ class AdminScriptTestCase(unittest.TestCase):
if old_python_path: if old_python_path:
os.environ['PYTHONPATH'] = old_python_path os.environ['PYTHONPATH'] = old_python_path
# Move back to the old working directory
os.chdir(old_cwd)
return out, err return out, err
def run_django_admin(self, args, settings_file=None): def run_django_admin(self, args, settings_file=None):