Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.2.X] Fixed #14148 -- Ensure the admin_script tests always use an a…

…bsolute path; PyPy (and sometimes CPython) return relative paths for __file__. Thanks to Alex Gaynor for the report and patch.

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
  • Loading branch information...
commit 5c6fe321fe00fa59006ea0c91300bd36a817411a 1 parent 1c3e3d3
Russell Keith-Magee freakboy3742 authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  tests/regressiontests/admin_scripts/tests.py
2  tests/regressiontests/admin_scripts/tests.py
View
@@ -133,7 +133,7 @@ def run_test(self, script, args, settings_file=None, apps=None):
return out, err
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)
def run_manage(self, args, settings_file=None):
Please sign in to comment.
Something went wrong with that request. Please try again.