]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.13] gh-124873: Skip timerfd tests on Android (GH-127279) (#127290)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Fri, 29 Nov 2024 11:46:47 +0000 (12:46 +0100)
committerGitHub <noreply@github.com>
Fri, 29 Nov 2024 11:46:47 +0000 (11:46 +0000)
gh-124873: Skip timerfd tests on Android (GH-127279)

* Revert "[3.13] gh-124873: Tolerate 100 ms in TimerfdTests on Android (GH-127101) (GH-127105)"

This reverts commit c09366b1fed2289530581505834b2b262120a7c7.

* Skip timerfd tests on Android.

(cherry picked from commit 4ca2c82862e3810a7d68799df2bb5198a9afb219)

Co-authored-by: Malcolm Smith <smith@chaquo.com>
Co-authored-by: Victor Stinner <vstinner@python.org>
Lib/test/test_os.py

index 10b489fb3e3538d77f11bfc7e92d0967f273e793..87e7328acab8f859f2c9b5d40b6247d1c8fad769 100644 (file)
@@ -4124,12 +4124,13 @@ class EventfdTests(unittest.TestCase):
         os.eventfd_read(fd)
 
 @unittest.skipUnless(hasattr(os, 'timerfd_create'), 'requires os.timerfd_create')
+@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
-    # 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