revert r83830, breaks tests on unixes
This commit is contained in:
parent
4eb5fa56e4
commit
1a0a737b13
|
@ -853,7 +853,7 @@ class Popen(object):
|
||||||
startupinfo.dwFlags |= _subprocess.STARTF_USESHOWWINDOW
|
startupinfo.dwFlags |= _subprocess.STARTF_USESHOWWINDOW
|
||||||
startupinfo.wShowWindow = _subprocess.SW_HIDE
|
startupinfo.wShowWindow = _subprocess.SW_HIDE
|
||||||
comspec = os.environ.get("COMSPEC", "cmd.exe")
|
comspec = os.environ.get("COMSPEC", "cmd.exe")
|
||||||
args = comspec + " /c " + '"%s"' % args
|
args = comspec + " /c " + args
|
||||||
if (_subprocess.GetVersion() >= 0x80000000 or
|
if (_subprocess.GetVersion() >= 0x80000000 or
|
||||||
os.path.basename(comspec).lower() == "command.com"):
|
os.path.basename(comspec).lower() == "command.com"):
|
||||||
# Win9x, or using command.com on NT. We need to
|
# Win9x, or using command.com on NT. We need to
|
||||||
|
|
|
@ -1015,7 +1015,6 @@ class Win32ProcessTestCase(BaseTestCase):
|
||||||
self._kill_process('terminate')
|
self._kill_process('terminate')
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# The module says:
|
# The module says:
|
||||||
# "NB This only works (and is only relevant) for UNIX."
|
# "NB This only works (and is only relevant) for UNIX."
|
||||||
#
|
#
|
||||||
|
@ -1042,46 +1041,6 @@ class CommandTests(unittest.TestCase):
|
||||||
if dir is not None:
|
if dir is not None:
|
||||||
os.rmdir(dir)
|
os.rmdir(dir)
|
||||||
|
|
||||||
class CommandsWithSpaces (BaseTestCase):
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
super().setUp()
|
|
||||||
f, fname = mkstemp(".py", "te st")
|
|
||||||
self.fname = fname.lower ()
|
|
||||||
os.write(f, b"import sys;"
|
|
||||||
b"sys.stdout.write('%d %s' % (len(sys.argv), [a.lower () for a in sys.argv]))"
|
|
||||||
)
|
|
||||||
os.close(f)
|
|
||||||
|
|
||||||
def tearDown(self):
|
|
||||||
os.remove(self.fname)
|
|
||||||
super().tearDown()
|
|
||||||
|
|
||||||
def with_spaces(self, *args, **kwargs):
|
|
||||||
kwargs['stdout'] = subprocess.PIPE
|
|
||||||
p = subprocess.Popen(*args, **kwargs)
|
|
||||||
self.assertEqual(
|
|
||||||
p.stdout.read ().decode("mbcs"),
|
|
||||||
"2 [%r, 'ab cd']" % self.fname
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_shell_string_with_spaces(self):
|
|
||||||
# call() function with string argument with spaces on Windows
|
|
||||||
self.with_spaces('"%s" "%s"' % (self.fname, "ab cd"), shell=1)
|
|
||||||
|
|
||||||
def test_shell_sequence_with_spaces(self):
|
|
||||||
# call() function with sequence argument with spaces on Windows
|
|
||||||
self.with_spaces([self.fname, "ab cd"], shell=1)
|
|
||||||
|
|
||||||
def test_noshell_string_with_spaces(self):
|
|
||||||
# call() function with string argument with spaces on Windows
|
|
||||||
self.with_spaces('"%s" "%s" "%s"' % (sys.executable, self.fname,
|
|
||||||
"ab cd"))
|
|
||||||
|
|
||||||
def test_noshell_sequence_with_spaces(self):
|
|
||||||
# call() function with sequence argument with spaces on Windows
|
|
||||||
self.with_spaces([sys.executable, self.fname, "ab cd"])
|
|
||||||
|
|
||||||
|
|
||||||
@unittest.skipUnless(getattr(subprocess, '_has_poll', False),
|
@unittest.skipUnless(getattr(subprocess, '_has_poll', False),
|
||||||
"poll system call not supported")
|
"poll system call not supported")
|
||||||
|
@ -1134,7 +1093,6 @@ def test_main():
|
||||||
Win32ProcessTestCase,
|
Win32ProcessTestCase,
|
||||||
ProcessTestCasePOSIXPurePython,
|
ProcessTestCasePOSIXPurePython,
|
||||||
CommandTests,
|
CommandTests,
|
||||||
CommandsWithSpaces,
|
|
||||||
ProcessTestCaseNoPoll,
|
ProcessTestCaseNoPoll,
|
||||||
HelperFunctionTests)
|
HelperFunctionTests)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue