From e47fec034e33e485bc85b543d883bc70d819ea1d Mon Sep 17 00:00:00 2001 From: "Miss Islington (bot)" <31488909+miss-islington@users.noreply.github.com> Date: Wed, 10 Jul 2024 12:35:29 +0200 Subject: [PATCH] [3.12] gh-121571: Do not use `EnvironmentError` in tests, use `OSError` instead (GH-121572) (#121575) gh-121571: Do not use `EnvironmentError` in tests, use `OSError` instead (GH-121572) (cherry picked from commit e2822360da30853f092d8a50ad83e52f6ea2ced9) Co-authored-by: sobolevn --- Lib/test/support/__init__.py | 2 +- Lib/test/test_subprocess.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 4e793f15494..585affcd385 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -386,7 +386,7 @@ def skip_if_buildbot(reason=None): reason = 'not suitable for buildbots' try: isbuildbot = getpass.getuser().lower() == 'buildbot' - except (KeyError, EnvironmentError) as err: + except (KeyError, OSError) as err: warnings.warn(f'getpass.getuser() failed {err}.', RuntimeWarning) isbuildbot = False return unittest.skipIf(isbuildbot, reason) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index f77c6ecc050..4e8e85a5902 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1407,7 +1407,7 @@ class ProcessTestCase(BaseTestCase): t = threading.Thread(target=open_fds) t.start() try: - with self.assertRaises(EnvironmentError): + with self.assertRaises(OSError): subprocess.Popen(NONEXISTING_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE,