From 249daddae7efe687a6b923e4779e53a633ac770e Mon Sep 17 00:00:00 2001 From: mayeut Date: Sat, 25 Mar 2023 11:12:34 +0100 Subject: [PATCH] remove some defaulted PYTHON_EXE_ENV Signed-off-by: mayeut --- psutil/tests/__init__.py | 1 - psutil/tests/test_posix.py | 4 +--- psutil/tests/test_process.py | 16 ++++++++-------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index d3e360f3f..da55bbf51 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -478,7 +478,6 @@ def pyrun(src, **kwds): """ kwds.setdefault("stdout", None) kwds.setdefault("stderr", None) - kwds.setdefault("env", PYTHON_EXE_ENV) srcfile = get_testfn() try: with open(srcfile, 'wt') as f: diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py index dce1ebede..d87322300 100755 --- a/psutil/tests/test_posix.py +++ b/psutil/tests/test_posix.py @@ -26,7 +26,6 @@ from psutil.tests import CI_TESTING from psutil.tests import HAS_NET_IO_COUNTERS from psutil.tests import PYTHON_EXE -from psutil.tests import PYTHON_EXE_ENV from psutil.tests import PsutilTestCase from psutil.tests import mock from psutil.tests import retry_on_failure @@ -139,8 +138,7 @@ class TestProcess(PsutilTestCase): @classmethod def setUpClass(cls): cls.pid = spawn_testproc([PYTHON_EXE, "-E", "-O"], - stdin=subprocess.PIPE, - env=PYTHON_EXE_ENV).pid + stdin=subprocess.PIPE).pid @classmethod def tearDownClass(cls): diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py index a2cee5529..df6a84c39 100755 --- a/psutil/tests/test_process.py +++ b/psutil/tests/test_process.py @@ -136,25 +136,25 @@ def test_wait_exited(self): # Test waitpid() + WIFEXITED -> WEXITSTATUS. # normal return, same as exit(0) cmd = [PYTHON_EXE, "-c", "pass"] - p = self.spawn_psproc(cmd, env=PYTHON_EXE_ENV) + p = self.spawn_psproc(cmd) code = p.wait() self.assertEqual(code, 0) self.assertProcessGone(p) # exit(1), implicit in case of error cmd = [PYTHON_EXE, "-c", "1 / 0"] - p = self.spawn_psproc(cmd, stderr=subprocess.PIPE, env=PYTHON_EXE_ENV) + p = self.spawn_psproc(cmd, stderr=subprocess.PIPE) code = p.wait() self.assertEqual(code, 1) self.assertProcessGone(p) # via sys.exit() cmd = [PYTHON_EXE, "-c", "import sys; sys.exit(5);"] - p = self.spawn_psproc(cmd, env=PYTHON_EXE_ENV) + p = self.spawn_psproc(cmd) code = p.wait() self.assertEqual(code, 5) self.assertProcessGone(p) # via os._exit() cmd = [PYTHON_EXE, "-c", "import os; os._exit(5);"] - p = self.spawn_psproc(cmd, env=PYTHON_EXE_ENV) + p = self.spawn_psproc(cmd) code = p.wait() self.assertEqual(code, 5) self.assertProcessGone(p) @@ -710,7 +710,7 @@ def test_exe(self): def test_cmdline(self): cmdline = [PYTHON_EXE, "-c", "import time; time.sleep(60)"] - p = self.spawn_psproc(cmdline, env=PYTHON_EXE_ENV) + p = self.spawn_psproc(cmdline) # XXX - most of the times the underlying sysctl() call on Net # and Open BSD returns a truncated string. # Also /proc/pid/cmdline behaves the same so it looks @@ -736,7 +736,7 @@ def test_long_cmdline(self): self.assertEqual(p.cmdline(), cmdline) def test_name(self): - p = self.spawn_psproc(PYTHON_EXE, env=PYTHON_EXE_ENV) + p = self.spawn_psproc(PYTHON_EXE) name = p.name().lower() pyexe = os.path.basename(os.path.realpath(sys.executable)).lower() assert pyexe.startswith(name), (pyexe, name) @@ -877,7 +877,7 @@ def test_cwd(self): def test_cwd_2(self): cmd = [PYTHON_EXE, "-c", "import os, time; os.chdir('..'); time.sleep(60)"] - p = self.spawn_psproc(cmd, env=PYTHON_EXE_ENV) + p = self.spawn_psproc(cmd) call_until(p.cwd, "ret == os.path.dirname(os.getcwd())") @unittest.skipIf(not HAS_CPU_AFFINITY, 'not supported') @@ -974,7 +974,7 @@ def test_open_files(self): # another process cmdline = "import time; f = open(r'%s', 'r'); time.sleep(60);" % testfn - p = self.spawn_psproc([PYTHON_EXE, "-c", cmdline], env=PYTHON_EXE_ENV) + p = self.spawn_psproc([PYTHON_EXE, "-c", cmdline]) for x in range(100): filenames = [os.path.normcase(x.path) for x in p.open_files()]