May 21, 2025 · May 21, 2025 · May 21, 2025 · May 21, 2025 · May 21, 2025 · May 21, 2025
diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py
        venv_exe = (venv / ("python_d.exe" if DEBUG_BUILD else "python.exe"))
        venv_exe.touch()
        try:
            yield venv_exe, {"VIRTUAL_ENV": str(venv.parent)}
            yield venv_exe, {
                "SystemRoot": os.environ.get("SystemRoot"),
                "VIRTUAL_ENV": str(venv.parent),
            }
        finally:
            shutil.rmtree(venv)

diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py
                               'sys.stdout.write("fruit="+os.getenv("fruit"))']
        if sys.platform == "win32":
            cmd = ["CMD", "/c", "SET", "fruit"]
        with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=newenv) as p:
            stdout, stderr = p.communicate()
            if p.returncode and support.verbose:
                print("STDOUT:", stdout.decode("ascii", "replace"))
                print("STDERR:", stderr.decode("ascii", "replace"))
            self.assertEqual(p.returncode, 0)
            self.assertEqual(stdout.strip(), b"fruit=orange")
        with warnings_helper.check_warnings(('env.*SystemRoot', RuntimeWarning), quiet=True):
            with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=newenv) as p:
                stdout, stderr = p.communicate()
                if p.returncode and support.verbose:
                    print("STDOUT:", stdout.decode("ascii", "replace"))
                    print("STDERR:", stderr.decode("ascii", "replace"))
                self.assertEqual(p.returncode, 0)
                self.assertEqual(stdout.strip(), b"fruit=orange")

    def test_invalid_cmd(self):
        # null character in the command name
        args = [sys.executable, "-c", 'pass']
        # Ignore subprocess errors - we only care that the API doesn't
        # raise an OSError
        subprocess.run(args, env={})
        with warnings_helper.check_warnings(('env.*SystemRoot', RuntimeWarning), quiet=True):
            subprocess.run(args, env={})

    def test_capture_output(self):
        cp = self.run_python(("import sys;"
        class BadEnv(dict):
            keys = None
        with self.assertRaises(TypeError):
            subprocess.Popen(ZERO_RETURN_CMD, env=BadEnv())
            with warnings_helper.check_warnings(('env.*SystemRoot', RuntimeWarning), quiet=True):
                subprocess.Popen(ZERO_RETURN_CMD, env=BadEnv())

    def test_close_fds(self):
        # close file descriptors
Original file line number	Diff line number	Diff line change
Expand Up		@@ -287,7 +287,10 @@ def fake_venv(self):
		venv_exe = (venv / ("python_d.exe" if DEBUG_BUILD else "python.exe"))
		venv_exe.touch()
		try:
		yield venv_exe, {"VIRTUAL_ENV": str(venv.parent)}
		yield venv_exe, {
		"SystemRoot": os.environ.get("SystemRoot"),
		"VIRTUAL_ENV": str(venv.parent),
		}
jhohm marked this conversation as resolved. Show resolvedHide resolved
		finally:
		shutil.rmtree(venv)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -857,13 +857,14 @@ def test_one_environment_variable(self):
		'sys.stdout.write("fruit="+os.getenv("fruit"))']
		if sys.platform == "win32":
		cmd = ["CMD", "/c", "SET", "fruit"]
		with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=newenv) as p:
		stdout, stderr = p.communicate()
		if p.returncode and support.verbose:
		print("STDOUT:", stdout.decode("ascii", "replace"))
		print("STDERR:", stderr.decode("ascii", "replace"))
		self.assertEqual(p.returncode, 0)
		self.assertEqual(stdout.strip(), b"fruit=orange")
		with warnings_helper.check_warnings(('env.*SystemRoot', RuntimeWarning), quiet=True):
		with subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=newenv) as p:
		stdout, stderr = p.communicate()
		if p.returncode and support.verbose:
		print("STDOUT:", stdout.decode("ascii", "replace"))
		print("STDERR:", stderr.decode("ascii", "replace"))
		self.assertEqual(p.returncode, 0)
		self.assertEqual(stdout.strip(), b"fruit=orange")

		def test_invalid_cmd(self):
		# null character in the command name
Expand DownExpand Up		@@ -1764,7 +1765,8 @@ def test_run_with_an_empty_env(self):
		args = [sys.executable, "-c", 'pass']
		# Ignore subprocess errors - we only care that the API doesn't
		# raise an OSError
		subprocess.run(args, env={})
		with warnings_helper.check_warnings(('env.*SystemRoot', RuntimeWarning), quiet=True):
		subprocess.run(args, env={})

		def test_capture_output(self):
		cp = self.run_python(("import sys;"
Expand DownExpand Up		@@ -3567,7 +3569,8 @@ def test_issue31471(self):
		class BadEnv(dict):
		keys = None
		with self.assertRaises(TypeError):
		subprocess.Popen(ZERO_RETURN_CMD, env=BadEnv())
		with warnings_helper.check_warnings(('env.*SystemRoot', RuntimeWarning), quiet=True):
		subprocess.Popen(ZERO_RETURN_CMD, env=BadEnv())

		def test_close_fds(self):
		# close file descriptors
Expand Down