From 8b7544cd024077615c62517f91ee74f50f40701d Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Sun, 26 Jul 2020 00:38:52 -0700 Subject: bpo-41385: Fix test_executable_without_cwd on Windows (GH-21608) (cherry picked from commit b1a87300a06324c9fc7d6553906ed914489465aa) Co-authored-by: Serhiy Storchaka --- Lib/test/test_subprocess.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index aced876..ba2844d 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -373,7 +373,9 @@ class ProcessTestCase(BaseTestCase): # matches *expected_cwd*. p = subprocess.Popen([python_arg, "-c", "import os, sys; " - "sys.stdout.write(os.getcwd()); " + "buf = sys.stdout.buffer; " + "buf.write(os.getcwd().encode()); " + "buf.flush(); " "sys.exit(47)"], stdout=subprocess.PIPE, **kwargs) @@ -382,7 +384,7 @@ class ProcessTestCase(BaseTestCase): self.assertEqual(47, p.returncode) normcase = os.path.normcase self.assertEqual(normcase(expected_cwd), - normcase(p.stdout.read().decode("utf-8"))) + normcase(p.stdout.read().decode())) def test_cwd(self): # Check that cwd changes the cwd for the child process. -- cgit v0.12