mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
Issue #10197 Rework subprocess.get[status]output to use subprocess functionality and thus to work on Windows. Patch by Nick Coghlan.
This commit is contained in:
parent
0bdcdecca7
commit
e004175c56
3 changed files with 14 additions and 24 deletions
|
@ -2133,13 +2133,6 @@ class Win32ProcessTestCase(BaseTestCase):
|
|||
def test_terminate_dead(self):
|
||||
self._kill_dead_process('terminate')
|
||||
|
||||
|
||||
# The module says:
|
||||
# "NB This only works (and is only relevant) for UNIX."
|
||||
#
|
||||
# Actually, getoutput should work on any platform with an os.popen, but
|
||||
# I'll take the comment as given, and skip this suite.
|
||||
@unittest.skipUnless(os.name == 'posix', "only relevant for UNIX")
|
||||
class CommandTests(unittest.TestCase):
|
||||
def test_getoutput(self):
|
||||
self.assertEqual(subprocess.getoutput('echo xyzzy'), 'xyzzy')
|
||||
|
@ -2153,8 +2146,8 @@ class CommandTests(unittest.TestCase):
|
|||
try:
|
||||
dir = tempfile.mkdtemp()
|
||||
name = os.path.join(dir, "foo")
|
||||
|
||||
status, output = subprocess.getstatusoutput('cat ' + name)
|
||||
status, output = subprocess.getstatusoutput(
|
||||
("type " if mswindows else "cat ") + name)
|
||||
self.assertNotEqual(status, 0)
|
||||
finally:
|
||||
if dir is not None:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue