summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-François Natali <neologix@free.fr>2012-01-28 10:37:42 (GMT)
committerCharles-François Natali <neologix@free.fr>2012-01-28 10:37:42 (GMT)
commit9ab91c60b26015398b47d2d573c39bac881f17e9 (patch)
tree25fd915908a483c731a8480d265bf7bf8ac4a278
parent963816defca26c8817b0185c245f7b30ae365f23 (diff)
parent6b671b259120e0004f49216d7197c5b0fd84d99c (diff)
downloadcpython-9ab91c60b26015398b47d2d573c39bac881f17e9.zip
cpython-9ab91c60b26015398b47d2d573c39bac881f17e9.tar.gz
cpython-9ab91c60b26015398b47d2d573c39bac881f17e9.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 da90e17..de29afa 100644
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -738,6 +738,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 158b231..d49b85f 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -492,6 +492,7 @@ Orjan Johansen
Fredrik Johansson
Gregory K. Johnson
Simon Johnston
+Matt Joiner
Thomas Jollans
Nicolas Joly
Evan Jones