diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-12-18 13:49:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-18 13:49:01 (GMT) |
| commit | 4f945ad7a510ad6dde13353784e45239edcdc14e (patch) | |
| tree | 10eafd6f42d365a69b6901247fc2e2f25a898f66 /Lib/test | |
| parent | a66be9185c6e0299293a06e21a6f599dfe6c3f60 (diff) | |
| download | cpython-4f945ad7a510ad6dde13353784e45239edcdc14e.zip cpython-4f945ad7a510ad6dde13353784e45239edcdc14e.tar.gz cpython-4f945ad7a510ad6dde13353784e45239edcdc14e.tar.bz2 | |
bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) (GH-30183)
Co-authored-by: Andrew Svetlov <andrew.svetlov@gmail.com>
(cherry picked from commit 427a490c495cde8a152e938c6f02be65620e3e59)
Co-authored-by: Jakub Kulík <Kulikjak@gmail.com>
Co-authored-by: Jakub Kulík <Kulikjak@gmail.com>
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/test_time.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 875615a..d89078f 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -113,12 +113,13 @@ class TimeTestCase(unittest.TestCase): clk_id = time.pthread_getcpuclockid(threading.get_ident()) self.assertTrue(type(clk_id) is int) # when in 32-bit mode AIX only returns the predefined constant - if not platform.system() == "AIX": - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - elif (sys.maxsize.bit_length() > 32): - self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) - else: + if platform.system() == "AIX" and (sys.maxsize.bit_length() <= 32): self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + # Solaris returns CLOCK_THREAD_CPUTIME_ID when current thread is given + elif sys.platform.startswith("sunos"): + self.assertEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) + else: + self.assertNotEqual(clk_id, time.CLOCK_THREAD_CPUTIME_ID) t1 = time.clock_gettime(clk_id) t2 = time.clock_gettime(clk_id) self.assertLessEqual(t1, t2) |