mirror of https://github.com/django/django.git
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:
parent
9376d4ed5b
commit
e18fccc62e
|
@ -58,6 +58,7 @@ class AdminScriptTestCase(unittest.TestCase):
|
|||
# Remember the old environment
|
||||
old_django_settings_module = os.environ.get('DJANGO_SETTINGS_MODULE', None)
|
||||
old_python_path = os.environ.get('PYTHONPATH', None)
|
||||
old_cwd = os.getcwd()
|
||||
|
||||
# Set the test environment
|
||||
if settings_file:
|
||||
|
@ -77,6 +78,9 @@ class AdminScriptTestCase(unittest.TestCase):
|
|||
os.environ['DJANGO_SETTINGS_MODULE'] = old_django_settings_module
|
||||
if old_python_path:
|
||||
os.environ['PYTHONPATH'] = old_python_path
|
||||
|
||||
# Move back to the old working directory
|
||||
os.chdir(old_cwd)
|
||||
|
||||
return out, err
|
||||
|
||||
|
|
Loading…
Reference in New Issue