[Python-checkins] bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140)
asvetlov
webhook-mailer at python.org
Sat Dec 18 08:26:38 EST 2021
https://github.com/python/cpython/commit/427a490c495cde8a152e938c6f02be65620e3e59
commit: 427a490c495cde8a152e938c6f02be65620e3e59
branch: main
author: Jakub Kulík <Kulikjak at gmail.com>
committer: asvetlov <andrew.svetlov at gmail.com>
date: 2021-12-18T15:26:24+02:00
summary:
bpo-46099: Fix pthread_getcpuclockid test on Solaris (GH-30140)
Co-authored-by: Andrew Svetlov <andrew.svetlov at gmail.com>
files:
M Lib/test/test_time.py
diff --git a/Lib/test/test_time.py b/Lib/test/test_time.py
index f98aec2651d9d..1aa5874dfe272 100644
--- a/Lib/test/test_time.py
+++ b/Lib/test/test_time.py
@@ -117,12 +117,13 @@ def test_pthread_getcpuclockid(self):
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)
More information about the Python-checkins
mailing list