https://github.com/python/cpython/commit/e47fec034e33e485bc85b543d883bc70d819ea1d commit: e47fec034e33e485bc85b543d883bc70d819ea1d branch: 3.12 author: Miss Islington (bot) <[email protected]> committer: sobolevn <[email protected]> date: 2024-07-10T10:35:29Z summary:
[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 <[email protected]> files: M Lib/test/support/__init__.py M Lib/test/test_subprocess.py diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index 4e793f154940e3..585affcd3855d6 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 f77c6ecc050f9b..4e8e85a5902f30 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -1407,7 +1407,7 @@ def open_fds(): 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, _______________________________________________ Python-checkins mailing list -- [email protected] To unsubscribe send an email to [email protected] https://mail.python.org/mailman3/lists/python-checkins.python.org/ Member address: [email protected]
