Commit 5c6fe321 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

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

[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.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 1c3e3d3d

tests/regressiontests/admin_scripts/tests.py

+1 −1
Original line number Diff line number Diff line
@@ -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):