summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2012-01-28 10:36:04 (GMT)
committerCharles-François Natali <neologix@free.fr>2012-01-28 10:36:04 (GMT)
commit6b671b259120e0004f49216d7197c5b0fd84d99c (patch)
treefffdbae4f3f2fc171cd88a7ecee439f16bc17934
parent261896b5591e819fe9c874e69469783c16161586 (diff)
downloadcpython-6b671b259120e0004f49216d7197c5b0fd84d99c.zip
cpython-6b671b259120e0004f49216d7197c5b0fd84d99c.tar.gz
cpython-6b671b259120e0004f49216d7197c5b0fd84d99c.tar.bz2
Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch
by Matt Joiner.
-rw-r--r--Lib/test/test_threading.py1
-rw-r--r--Misc/ACKS1
2 files changed, 2 insertions, 0 deletions
diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index ef15d10..924d9d3 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -726,6 +726,7 @@ class LockTests(lock_tests.LockTests):
class PyRLockTests(lock_tests.RLockTests):
locktype = staticmethod(threading._PyRLock)
+@unittest.skipIf(threading._CRLock is None, 'RLock not implemented in C')
class CRLockTests(lock_tests.RLockTests):
locktype = staticmethod(threading._CRLock)
diff --git a/Misc/ACKS b/Misc/ACKS
index c888a8c..8117d80 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -453,6 +453,7 @@ Orjan Johansen
Fredrik Johansson
Gregory K. Johnson
Simon Johnston
+Matt Joiner
Thomas Jollans
Nicolas Joly
Evan Jones