From 2a7b7988980d65b3e95dba21287f5ec0df77e635 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Mon, 25 Nov 2024 20:46:05 +0000 Subject: [PATCH 1/3] Revert "[3.13] gh-124873: Tolerate 100 ms in TimerfdTests on Android (GH-127101) (#127105)" This reverts commit c09366b1fed2289530581505834b2b262120a7c7. --- Lib/test/test_os.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 99515dfc71f9ba..467da78f9e1779 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -4177,9 +4177,9 @@ def test_eventfd_select(self): @support.requires_linux_version(2, 6, 30) class TimerfdTests(unittest.TestCase): # 1 ms accuracy is reliably achievable on every platform except Android - # emulators, where we allow 100 ms (gh-124873). + # emulators, where we allow 10 ms (gh-108277). if sys.platform == "android" and platform.android_ver().is_emulator: - CLOCK_RES_PLACES = 1 + CLOCK_RES_PLACES = 2 else: CLOCK_RES_PLACES = 3 From 7fb4ef311f11a0d12c26ef23f16da20168cc2878 Mon Sep 17 00:00:00 2001 From: Malcolm Smith Date: Tue, 26 Nov 2024 00:15:39 +0000 Subject: [PATCH 2/3] Skip timerfd tests on Android --- Lib/test/test_os.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 467da78f9e1779..74cb39c3ce5369 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -4174,6 +4174,7 @@ def test_eventfd_select(self): os.eventfd_read(fd) @unittest.skipUnless(hasattr(os, 'timerfd_create'), 'requires os.timerfd_create') +@unittest.skipIf(sys.platform == "android", "#124873: Test is flaky on Android") @support.requires_linux_version(2, 6, 30) class TimerfdTests(unittest.TestCase): # 1 ms accuracy is reliably achievable on every platform except Android From 34138eb515941be53a56bd8f027f3ff99ad65790 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 26 Nov 2024 10:16:51 +0100 Subject: [PATCH 3/3] Update Lib/test/test_os.py --- Lib/test/test_os.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py index 74cb39c3ce5369..f3d2ceb263f6f4 100644 --- a/Lib/test/test_os.py +++ b/Lib/test/test_os.py @@ -4174,7 +4174,7 @@ def test_eventfd_select(self): os.eventfd_read(fd) @unittest.skipUnless(hasattr(os, 'timerfd_create'), 'requires os.timerfd_create') -@unittest.skipIf(sys.platform == "android", "#124873: Test is flaky on Android") +@unittest.skipIf(sys.platform == "android", "gh-124873: Test is flaky on Android") @support.requires_linux_version(2, 6, 30) class TimerfdTests(unittest.TestCase): # 1 ms accuracy is reliably achievable on every platform except Android