From: Charles-François Natali <neologix@free.fr>
Date: Sat, 28 Jan 2012 10:36:04 +0000 (+0100)
Subject: Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch
X-Git-Tag: v3.2.3rc1~114
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b671b259120e0004f49216d7197c5b0fd84d99c;p=thirdparty%2FPython%2Fcpython.git

Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch
by Matt Joiner.
---

diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
index ef15d10dbdc9..924d9d3ce6e5 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 c888a8cbea40..8117d80b1370 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