From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Sat, 18 Dec 2021 15:51:34 +0000 (-0800) Subject: bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) (#30184) X-Git-Tag: v3.9.10~49 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a328ad7f9a9b6cd624da5efcc76daf88e0d22312;p=thirdparty%2FPython%2Fcpython.git bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140) (#30184) Co-authored-by: Andrew Svetlov (cherry picked from commit 427a490c495cde8a152e938c6f02be65620e3e59) Co-authored-by: Jakub Kulík --- diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py index 90a123828b70..be9fb5ad5f0b 100644 --- a/Lib/test/test_time.py +++ b/Lib/test/test_time.py @@ -112,12 +112,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)