From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 10 Jul 2024 10:35:29 +0000 (+0200)
Subject: [3.12] gh-121571: Do not use `EnvironmentError` in tests, use `OSError` instead ... 
X-Git-Tag: v3.12.5~125
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e47fec034e33e485bc85b543d883bc70d819ea1d;p=thirdparty%2FPython%2Fcpython.git

[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 <mail@sobolevn.me>
---

diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py
index 4e793f154940..585affcd3855 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 f77c6ecc050f..4e8e85a5902f 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,