Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.2.X] Fixed #14148 -- Ensure the admin_script tests always use an absolute path; PyPy (and sometimes CPython) return relative paths for __file__. Thanks to Alex Gaynor for the report and patch.

Browse Source 
Backport of r13618 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2010-08-21 02:56:05 +00:00
parent 1c3e3d3dba
commit 5c6fe321fe
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ class AdminScriptTestCase(unittest.TestCase):
return out, err return out, err
def run_django_admin(self, args, settings_file=None): def run_django_admin(self, args, settings_file=None):
bin_dir = os.path.dirname(bin.__file__) bin_dir = os.path.abspath(os.path.dirname(bin.__file__))
return self.run_test(os.path.join(bin_dir,'django-admin.py'), args, settings_file) return self.run_test(os.path.join(bin_dir,'django-admin.py'), args, settings_file)
def run_manage(self, args, settings_file=None): def run_manage(self, args, settings_file=None):