From 85df2378af467f6d2fb00ce7f609bda4f693cdf6 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 5 Oct 2017 06:32:53 -0700 Subject: [PATCH] [3.6] bpo-31178: Mock os.waitpid() in test_subprocess (GH-3896) Fix test_exception_errpipe_bad_data() and test_exception_errpipe_normal() of test_subprocess: mock os.waitpid() to avoid calling the real os.waitpid(0, 0) which is an unexpected side effect of the test. (cherry picked from commit 11045c9d8a21dd9bd182a3939189db02815f9783) --- Lib/test/test_subprocess.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 391d08cd9c3c3a..5016513decd8c7 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1568,8 +1568,10 @@ def proper_error(*args): fork_exec.side_effect = proper_error - with self.assertRaises(IsADirectoryError): - self.PopenNoDestructor(["non_existent_command"]) + with mock.patch("subprocess.os.waitpid", + side_effect=ChildProcessError): + with self.assertRaises(IsADirectoryError): + self.PopenNoDestructor(["non_existent_command"]) @mock.patch("subprocess._posixsubprocess.fork_exec") def test_exception_errpipe_bad_data(self, fork_exec): @@ -1586,8 +1588,10 @@ def bad_error(*args): fork_exec.side_effect = bad_error - with self.assertRaises(subprocess.SubprocessError) as e: - self.PopenNoDestructor(["non_existent_command"]) + with mock.patch("subprocess.os.waitpid", + side_effect=ChildProcessError): + with self.assertRaises(subprocess.SubprocessError) as e: + self.PopenNoDestructor(["non_existent_command"]) self.assertIn(repr(error_data), str(e.exception))