[Python-checkins] cpython (merge 3.2 -> default): Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch

[charles-francois.natali]

http://hg.python.org/cpython/rev/279b6d778663
changeset:   74666:279b6d778663
parent:      74663:265d35e8fe82
parent:      74665:5cf181df7bea
user:        Charles-François Natali <neologix at free.fr>
date:        Sat Jan 28 11:37:42 2012 +0100
summary:
  Issue #13894: Skip test_threading.CRLockTests if _CRLock isn't available. Patch
by Matt Joiner.

files:
  Lib/test/test_threading.py |  1 +
  Misc/ACKS                  |  1 +
  2 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py
--- a/Lib/test/test_threading.py
+++ b/Lib/test/test_threading.py
@@ -738,6 +738,7 @@
 class PyRLockTests(lock_tests.RLockTests):
     locktype = staticmethod(threading._PyRLock)
 
+ at 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
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -492,6 +492,7 @@
 Fredrik Johansson
 Gregory K. Johnson
 Simon Johnston
+Matt Joiner
 Thomas Jollans
 Nicolas Joly
 Evan Jones

-- 
Repository URL: http://hg.python.org/cpython