#11963: remove human verification from test_subprocess.
diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index 69384ba..8e0149d 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -150,16 +150,27 @@
self.assertEqual(p.stdin, None)
def test_stdout_none(self):
- # .stdout is None when not redirected
- p = subprocess.Popen([sys.executable, "-c",
- 'print " this bit of output is from a '
- 'test of stdout in a different '
- 'process ..."'],
- stdin=subprocess.PIPE, stderr=subprocess.PIPE)
- self.addCleanup(p.stdin.close)
+ # .stdout is None when not redirected, and the child's stdout will
+ # be inherited from the parent. In order to test this we run a
+ # subprocess in a subprocess:
+ # this_test
+ # \-- subprocess created by this test (parent)
+ # \-- subprocess created by the parent subprocess (child)
+ # The parent doesn't specify stdout, so the child will use the
+ # parent's stdout. This test checks that the message printed by the
+ # child goes to the parent stdout. The parent also checks that the
+ # child's stdout is None. See #11963.
+ code = ('import sys; from subprocess import Popen, PIPE;'
+ 'p = Popen([sys.executable, "-c", "print \'test_stdout_none\'"],'
+ ' stdin=PIPE, stderr=PIPE);'
+ 'p.wait(); assert p.stdout is None;')
+ p = subprocess.Popen([sys.executable, "-c", code],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.addCleanup(p.stdout.close)
self.addCleanup(p.stderr.close)
- p.wait()
- self.assertEqual(p.stdout, None)
+ out, err = p.communicate()
+ self.assertEqual(p.returncode, 0, err)
+ self.assertEqual(out.rstrip(), 'test_stdout_none')
def test_stderr_none(self):
# .stderr is None when not redirected
@@ -308,9 +319,22 @@
def test_stdout_filedes_of_stdout(self):
# stdout is set to 1 (#1531862).
- cmd = r"import sys, os; sys.exit(os.write(sys.stdout.fileno(), '.\n'))"
- rc = subprocess.call([sys.executable, "-c", cmd], stdout=1)
- self.assertEqual(rc, 2)
+ # To avoid printing the '.\n' on stdout, we do something similar to
+ # test_stdout_none (see above). The parent subprocess calls the child
+ # subprocess passing stdout=1, and this test uses stdout=PIPE in
+ # order to capture and check the output of the parent. See #11963.
+ code = ('import sys, subprocess; '
+ 'rc = subprocess.call([sys.executable, "-c", '
+ ' "import os, sys; sys.exit(os.write(sys.stdout.fileno(), '
+ '\'.\\\\n\'))"], stdout=1); '
+ 'assert rc == 2')
+ p = subprocess.Popen([sys.executable, "-c", code],
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self.addCleanup(p.stdout.close)
+ self.addCleanup(p.stderr.close)
+ out, err = p.communicate()
+ self.assertEqual(p.returncode, 0, err)
+ self.assertEqual(out, '.\n')
def test_cwd(self):
tmpdir = tempfile.gettempdir()
diff --git a/Misc/NEWS b/Misc/NEWS
index 588a5c6..860c64e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -812,6 +812,8 @@
Tests
-----
+- Issue #11963: remove human verification from test_parser and test_subprocess.
+
- Issue #17249: convert a test in test_capi to use unittest and reap threads.
- We now run both test_email.py and test_email_renamed.py when running the