Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8cd5d283691e5e1005b7cdd18676ce9c6b13a857 1 parent d33736b
Russell Keith-Magee authored
2  tests/regressiontests/admin_scripts/tests.py
@@ -133,7 +133,7 @@ def run_test(self, script, args, settings_file=None, apps=None):
133 133
         return out, err
134 134
 
135 135
     def run_django_admin(self, args, settings_file=None):
136  
-        bin_dir = os.path.dirname(bin.__file__)
  136
+        bin_dir = os.path.abspath(os.path.dirname(bin.__file__))
137 137
         return self.run_test(os.path.join(bin_dir,'django-admin.py'), args, settings_file)
138 138
 
139 139
     def run_manage(self, args, settings_file=None):

0 notes on commit 8cd5d28

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