From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sun, 26 Jul 2020 07:38:48 +0000 (-0700)
Subject: bpo-41385: Fix test_executable_without_cwd on Windows (GH-21608)
X-Git-Tag: v3.8.6rc1~70
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33cebe0b9a71da97046fc67c03062987c1049418;p=thirdparty%2FPython%2Fcpython.git

bpo-41385: Fix test_executable_without_cwd on Windows (GH-21608)

(cherry picked from commit b1a87300a06324c9fc7d6553906ed914489465aa)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
---

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
index f8fee3687136..2d3ab93555b4 100644
--- a/Lib/test/test_subprocess.py
+++ b/Lib/test/test_subprocess.py
@@ -372,7 +372,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)
@@ -381,7 +383,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.