From: Russell Keith-Magee <russell@keith-magee.com>
Date: Wed, 1 May 2024 02:31:00 +0000 (+0800)
Subject: gh-118201: Accomodate flaky behavior of `os.sysconf` on iOS (GH-118453)
X-Git-Tag: v3.13.0b1~191
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=21336aa12762ffe33bac83c7bd7992fcf42eee10;p=thirdparty%2FPython%2Fcpython.git

gh-118201: Accomodate flaky behavior of `os.sysconf` on iOS (GH-118453)
---

diff --git a/Lib/test/support/os_helper.py b/Lib/test/support/os_helper.py
index 8071c248b9b6..891405943b78 100644
--- a/Lib/test/support/os_helper.py
+++ b/Lib/test/support/os_helper.py
@@ -632,7 +632,8 @@ def fd_count():
     if hasattr(os, 'sysconf'):
         try:
             MAXFD = os.sysconf("SC_OPEN_MAX")
-        except OSError:
+        except (OSError, ValueError):
+            # gh-118201: ValueError is raised intermittently on iOS
             pass
 
     old_modes = None
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index 6a34f48f7873..eaa676673f8a 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -2365,6 +2365,7 @@ class TestInvalidFD(unittest.TestCase):
         support.is_emscripten or support.is_wasi,
         "musl libc issue on Emscripten/WASI, bpo-46390"
     )
+    @unittest.skipIf(support.is_apple_mobile, "gh-118201: Test is flaky on iOS")
     def test_fpathconf(self):
         self.check(os.pathconf, "PC_NAME_MAX")
         self.check(os.fpathconf, "PC_NAME_MAX")