From 86085a47717c4dbc1ef3ef97be21055d770e6fe6 Mon Sep 17 00:00:00 2001 From: "Gregory P. Smith" Date: Sun, 27 Apr 2025 13:28:23 -0700 Subject: [PATCH] [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 --- Lib/test/test_fcntl.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index bb784cbe2ce036..b84c98ef3a2972 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 @@ def test_fcntl_bad_file_overflow(self): 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)