summaryrefslogtreecommitdiff
path: root/Lib/test/test_subprocess.py
diff options
context:
space:
mode:
authorTim Golden <mail@timgolden.me.uk>2013-11-03 12:53:17 +0000
committerTim Golden <mail@timgolden.me.uk>2013-11-03 12:53:17 +0000
commite004175c5694804c263f0f06e7a4e3bbc6852cc4 (patch)
treeac8643f53299b0b22873ee3ee07d03651b38e8c0 /Lib/test/test_subprocess.py
parent0bdcdecca7736151278097784720be08cbdc221c (diff)
downloadcpython-git-e004175c5694804c263f0f06e7a4e3bbc6852cc4.tar.gz
Issue #10197 Rework subprocess.get[status]output to use subprocess functionality and thus to work on Windows. Patch by Nick Coghlan.
Diffstat (limited to 'Lib/test/test_subprocess.py')
-rw-r--r--Lib/test/test_subprocess.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 4c9f29bdb8..77f1ba3155 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -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: