[3.12] gh-121571: Do not use EnvironmentError in tests, use OSError instead (GH-121572) (#121575)

miss-islington · sobolevn · web-flow · commit e47fec034e33 · 2024-07-10T10:35:29.000Z
gh-121571: Do not use `EnvironmentError` in tests, use `OSError` instead (GH-121572) (cherry picked from commit e282236) Co-authored-by: sobolevn <mail@sobolevn.me>
diff --git 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
@@ -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,
