Author: russellm
Date: 2010-08-20 21:56:05 -0500 (Fri, 20 Aug 2010)
New Revision: 13619
Modified:
django/branches/releases/1.2.X/tests/regressiontests/admin_scripts/tests.py
Log:
[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.
Backport of r13618 from trunk.
Modified:
django/branches/releases/1.2.X/tests/regressiontests/admin_scripts/tests.py
===================================================================
--- django/branches/releases/1.2.X/tests/regressiontests/admin_scripts/tests.py
2010-08-21 02:55:02 UTC (rev 13618)
+++ django/branches/releases/1.2.X/tests/regressiontests/admin_scripts/tests.py
2010-08-21 02:56:05 UTC (rev 13619)
@@ -133,7 +133,7 @@
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):
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
