Commit f0ed1ce6 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.1.X] Fixed #13173: Made the admin_scripts tests pass when the running... 

[1.1.X] Fixed #13173: Made the admin_scripts tests pass when the running python executable has a space in its pathname. Thanks gabrielhurley. 

r12842 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 21a1a21d

tests/regressiontests/admin_scripts/tests.py

+6 −2
Original line number Diff line number Diff line
@@ -102,8 +102,12 @@ class AdminScriptTestCase(unittest.TestCase): 
        os.environ[python_path_var_name] = os.pathsep.join(python_path)



        # Build the command line

        cmd = '%s "%s"' % (sys.executable, script)

        cmd += ''.join([' %s' % arg for arg in args])

        executable = sys.executable

        arg_string = ' '.join(['%s' % arg for arg in args])

        if ' ' in executable:

            cmd = '""%s" "%s" %s"' % (executable, script, arg_string)

        else:

            cmd = '%s "%s" %s' % (executable, script, arg_string)



        # Move to the test directory and run

        os.chdir(test_dir)