From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Sun, 27 Apr 2025 20:54:37 +0000 (+0200) Subject: [3.13] [tests] fix test_fcntl issue when run in a ChromeOS linux runtime (GH-133053... X-Git-Tag: v3.13.4~214 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fdc10686ba46150879230e67ce33d454fe6fa76;p=thirdparty%2FPython%2Fcpython.git [3.13] [tests] fix test_fcntl issue when run in a ChromeOS linux runtime (GH-133053) (GH-133056) [tests] fix test_fcntl issue when run in a ChromeOS linux runtime (GH-133053) * [tests] test_fcntl fails when run in a ChromeOS linux runtime container. It doesn't appear to support F_NOTIFY? Detect the lack of that and skip the test. (cherry picked from commit 355ee1a429e68602696d5a4a9966c1448af1c8d1) Co-authored-by: Gregory P. Smith --- diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index bb784cbe2ce0..b84c98ef3a29 100644 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -1,5 +1,6 @@ """Test program for the fcntl C module. """ +import errno import multiprocessing import platform import os @@ -135,16 +136,21 @@ class TestFcntl(unittest.TestCase): or platform.system() == "Android", "this platform returns EINVAL for F_NOTIFY DN_MULTISHOT") def test_fcntl_64_bit(self): - # Issue #1309352: fcntl shouldn't fail when the third arg fits in a + # Issue GH-42434: fcntl shouldn't fail when the third arg fits in a # C 'long' but not in a C 'int'. try: cmd = fcntl.F_NOTIFY - # This flag is larger than 2**31 in 64-bit builds + # DN_MULTISHOT is >= 2**31 in 64-bit builds flags = fcntl.DN_MULTISHOT except AttributeError: self.skipTest("F_NOTIFY or DN_MULTISHOT unavailable") fd = os.open(os.path.dirname(os.path.abspath(TESTFN)), os.O_RDONLY) try: + try: + fcntl.fcntl(fd, cmd, fcntl.DN_DELETE) + except OSError as exc: + if exc.errno == errno.EINVAL: + self.skipTest("F_NOTIFY not available by this environment") fcntl.fcntl(fd, cmd, flags) finally: os.close(fd)