Przeglądaj źródła

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

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12842 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Karen Tracey 15 lat temu
rodzic
commit
c62c47e638
1 zmienionych plików z 6 dodań i 2 usunięć
  1. 6 2
      tests/regressiontests/admin_scripts/tests.py

+ 6 - 2
tests/regressiontests/admin_scripts/tests.py

@@ -101,8 +101,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)