Skip to content

Commit

Permalink
pythongh-108277: Fix test_os TimerfdTests
Browse files Browse the repository at this point in the history
* test_timerfd_TFD_TIMER_ABSTIME() and
  test_timerfd_ns_TFD_TIMER_ABSTIME() tolerate a difference of 50 us.
* test_timerfd_negative() checks if os.TFD_TIMER_CANCEL_ON_SET is
  defined.
  • Loading branch information
vstinner committed Oct 8, 2023
1 parent 8e56d55 commit d2b621d
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions Lib/test/test_os.py
Expand Up @@ -3929,6 +3929,10 @@ def test_eventfd_select(self):
@unittest.skipUnless(hasattr(os, 'timerfd_create'), 'requires os.timerfd_create')
@support.requires_linux_version(2, 6, 30)
class TimerfdTests(unittest.TestCase):
# Tolerate a difference of 50 us
CLOCK_RES_NS = 50_000 # 50 us
CLOCK_RES = CLOCK_RES_NS * 1e-9

def timerfd_create(self, *args, **kwargs):
fd = os.timerfd_create(*args, **kwargs)
self.assertGreaterEqual(fd, 0)
Expand Down Expand Up @@ -3982,9 +3986,13 @@ def test_timerfd_negative(self):
one_sec_in_nsec = 10**9
fd = self.timerfd_create(time.CLOCK_REALTIME)

test_flags = [0, os.TFD_TIMER_ABSTIME]
if hasattr(os, 'TFD_TIMER_CANCEL_ON_SET'):
test_flags.append(os.TFD_TIMER_ABSTIME | os.TFD_TIMER_CANCEL_ON_SET)

# Any of 'initial' and 'interval' is negative value.
for initial, interval in ( (-1, 0), (1, -1), (-1, -1), (-0.1, 0), (1, -0.1), (-0.1, -0.1)):
for flags in (0, os.TFD_TIMER_ABSTIME, os.TFD_TIMER_ABSTIME|os.TFD_TIMER_CANCEL_ON_SET):
for flags in test_flags:
with self.subTest(flags=flags, initial=initial, interval=interval):
with self.assertRaises(OSError) as context:
_, _ = os.timerfd_settime(fd, flags=flags, initial=initial, interval=interval)
Expand Down Expand Up @@ -4055,7 +4063,7 @@ def test_timerfd_TFD_TIMER_ABSTIME(self):
t = time.perf_counter() - t
self.assertEqual(count_signaled, 1)

self.assertGreater(t, offset)
self.assertGreater(t, offset - self.CLOCK_RES)

def test_timerfd_select(self):
size = 8 # read 8 bytes
Expand Down Expand Up @@ -4208,7 +4216,7 @@ def test_timerfd_ns_TFD_TIMER_ABSTIME(self):
t = time.perf_counter_ns() - t
self.assertEqual(count_signaled, 1)

self.assertGreater(t, offset_ns)
self.assertGreater(t, offset_ns - self.CLOCK_RES_NS)

def test_timerfd_ns_select(self):
size = 8 # read 8 bytes
Expand Down

0 comments on commit d2b621d

Please sign in to comment.