]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-41385: Fix test_executable_without_cwd on Windows (GH-21608)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sun, 26 Jul 2020 07:38:48 +0000 (00:38 -0700)
committerGitHub <noreply@github.com>
Sun, 26 Jul 2020 07:38:48 +0000 (00:38 -0700)
(cherry picked from commit b1a87300a06324c9fc7d6553906ed914489465aa)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
Lib/test/test_subprocess.py

index f8fee3687136f20141c21f4b5116bdf960d03a06..2d3ab93555b4c3e796a2ae05278c54c5a42ab602 100644 (file)
@@ -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.