[Python-checkins] r73149 - in python/branches/py3k: Lib/distutils/spawn.py Lib/distutils/tests/test_spawn.py
tarek.ziade
python-checkins at python.org
Tue Jun 2 18:18:55 CEST 2009
Author: tarek.ziade
Date: Tue Jun 2 18:18:55 2009
New Revision: 73149
Log:
Merged revisions 73147 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r73147 | tarek.ziade | 2009-06-02 17:58:43 +0200 (Tue, 02 Jun 2009) | 1 line
improved distutils.spawn test coverage + cleaned it up
........
Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Lib/distutils/spawn.py
python/branches/py3k/Lib/distutils/tests/test_spawn.py
Modified: python/branches/py3k/Lib/distutils/spawn.py
==============================================================================
--- python/branches/py3k/Lib/distutils/spawn.py (original)
+++ python/branches/py3k/Lib/distutils/spawn.py Tue Jun 2 18:18:55 2009
@@ -8,13 +8,16 @@
__revision__ = "$Id$"
-import sys, os
-from distutils.errors import *
+import sys
+import os
+
+from distutils.errors import DistutilsPlatformError, DistutilsExecError
from distutils import log
def spawn(cmd, search_path=1, verbose=0, dry_run=0):
- """Run another program, specified as a command list 'cmd', in a new
- process. 'cmd' is just the argument list for the new process, ie.
+ """Run another program, specified as a command list 'cmd', in a new process.
+
+ 'cmd' is just the argument list for the new process, ie.
cmd[0] is the program to run and cmd[1:] are the rest of its arguments.
There is no way to run a program with a name different from that of its
executable.
@@ -37,10 +40,10 @@
raise DistutilsPlatformError(
"don't know how to spawn programs on platform '%s'" % os.name)
-
def _nt_quote_args(args):
- """Quote command-line arguments for DOS/Windows conventions: just
- wraps every argument which contains blanks in double quotes, and
+ """Quote command-line arguments for DOS/Windows conventions.
+
+ Just wraps every argument which contains blanks in double quotes, and
returns a new argument list.
"""
# XXX this doesn't seem very robust to me -- but if the Windows guys
@@ -48,9 +51,9 @@
# contains quotes? What other magic characters, other than spaces,
# have to be escaped? Is there an escaping mechanism other than
# quoting?)
- for i in range(len(args)):
- if args[i].find(' ') != -1:
- args[i] = '"%s"' % args[i]
+ for i, arg in enumerate(args):
+ if ' ' in arg:
+ args[i] = '"%s"' % arg
return args
def _spawn_nt(cmd, search_path=1, verbose=0, dry_run=0):
@@ -73,10 +76,8 @@
raise DistutilsExecError(
"command '%s' failed with exit status %d" % (cmd[0], rc))
-
def _spawn_os2(cmd, search_path=1, verbose=0, dry_run=0):
executable = cmd[0]
- #cmd = _nt_quote_args(cmd)
if search_path:
# either we find one or it stays the same
executable = find_executable(executable) or executable
@@ -91,17 +92,15 @@
"command '%s' failed: %s" % (cmd[0], exc.args[-1]))
if rc != 0:
# and this reflects the command running but failing
- print("command '%s' failed with exit status %d" % (cmd[0], rc))
+ log.debug("command '%s' failed with exit status %d" % (cmd[0], rc))
raise DistutilsExecError(
"command '%s' failed with exit status %d" % (cmd[0], rc))
-
def _spawn_posix(cmd, search_path=1, verbose=0, dry_run=0):
log.info(' '.join(cmd))
if dry_run:
return
exec_fn = search_path and os.execvp or os.execv
-
pid = os.fork()
if pid == 0: # in the child
try:
@@ -118,7 +117,7 @@
# (ie. keep waiting if it's merely stopped)
while True:
try:
- (pid, status) = os.waitpid(pid, 0)
+ pid, status = os.waitpid(pid, 0)
except OSError as exc:
import errno
if exc.errno == errno.EINTR:
@@ -132,7 +131,7 @@
elif os.WIFEXITED(status):
exit_status = os.WEXITSTATUS(status)
if exit_status == 0:
- return # hey, it succeeded!
+ return # hey, it succeeded!
else:
raise DistutilsExecError(
"command '%s' failed with exit status %d"
@@ -144,19 +143,21 @@
"unknown error executing '%s': termination status %d"
% (cmd[0], status))
-
def find_executable(executable, path=None):
- """Try to find 'executable' in the directories listed in 'path' (a
- string listing directories separated by 'os.pathsep'; defaults to
- os.environ['PATH']). Returns the complete filename or None if not
- found.
+ """Tries to find 'executable' in the directories listed in 'path'.
+
+ A string listing directories separated by 'os.pathsep'; defaults to
+ os.environ['PATH']. Returns the complete filename or None if not found.
"""
if path is None:
path = os.environ['PATH']
+
paths = path.split(os.pathsep)
- (base, ext) = os.path.splitext(executable)
+ base, ext = os.path.splitext(executable)
+
if (sys.platform == 'win32' or os.name == 'os2') and (ext != '.exe'):
executable = executable + '.exe'
+
if not os.path.isfile(executable):
for p in paths:
f = os.path.join(p, executable)
Modified: python/branches/py3k/Lib/distutils/tests/test_spawn.py
==============================================================================
--- python/branches/py3k/Lib/distutils/tests/test_spawn.py (original)
+++ python/branches/py3k/Lib/distutils/tests/test_spawn.py Tue Jun 2 18:18:55 2009
@@ -1,8 +1,17 @@
"""Tests for distutils.spawn."""
import unittest
+import os
+import time
+from test.support import captured_stdout
+
from distutils.spawn import _nt_quote_args
+from distutils.spawn import spawn, find_executable
+from distutils.errors import DistutilsExecError
+from distutils.tests import support
-class SpawnTestCase(unittest.TestCase):
+class SpawnTestCase(support.TempdirManager,
+ support.LoggingSilencer,
+ unittest.TestCase):
def test_nt_quote_args(self):
@@ -13,6 +22,35 @@
res = _nt_quote_args(args)
self.assertEquals(res, wanted)
+
+ @unittest.skipUnless(os.name in ('nt', 'posix'),
+ 'Runs only under posix or nt')
+ def test_spawn(self):
+ tmpdir = self.mkdtemp()
+
+ # creating something executable
+ # through the shell that returns 1
+ if os.name == 'posix':
+ exe = os.path.join(tmpdir, 'foo.sh')
+ self.write_file(exe, '#!/bin/sh\nexit 1')
+ else:
+ exe = os.path.join(tmpdir, 'foo.bat')
+ self.write_file(exe, 'exit 1')
+
+ os.chmod(exe, 0o777)
+ self.assertRaises(DistutilsExecError, spawn, [exe])
+
+ # now something that works
+ if os.name == 'posix':
+ exe = os.path.join(tmpdir, 'foo.sh')
+ self.write_file(exe, '#!/bin/sh\nexit 0')
+ else:
+ exe = os.path.join(tmpdir, 'foo.bat')
+ self.write_file(exe, 'exit 0')
+
+ os.chmod(exe, 0o777)
+ spawn([exe]) # should work without any error
+
def test_suite():
return unittest.makeSuite(SpawnTestCase)
More information about the Python-checkins
mailing list