diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-08-21 02:55:02 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-08-21 02:55:02 +0000 |
| commit | 8cd5d283691e5e1005b7cdd18676ce9c6b13a857 (patch) | |
| tree | 7fcb8e78d8a519615a374e04f5b6006a8718e7e3 /tests/regressiontests/admin_scripts | |
| parent | d33736b3ee267156cc91b6a4ebf0e2f0a1b162cc (diff) | |
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
Diffstat (limited to 'tests/regressiontests/admin_scripts')
| -rw-r--r-- | tests/regressiontests/admin_scripts/tests.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/regressiontests/admin_scripts/tests.py b/tests/regressiontests/admin_scripts/tests.py index 7ec2454561..3dd8ad5d13 100644 --- a/tests/regressiontests/admin_scripts/tests.py +++ b/tests/regressiontests/admin_scripts/tests.py @@ -133,7 +133,7 @@ class AdminScriptTestCase(unittest.TestCase): 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): |