summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_thread.py
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-11-09 16:52:46 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-11-09 16:52:46 (GMT)
commit959f3e50322467b9d894de67b118eb688753f9f1 (patch)
tree3368d6ff7fcaf4ff8923f72b89643de9634fb344 /Lib/test/test_thread.py
parent536d299ca0d06c249f2674266acaf4fc4411d5bf (diff)
downloadcpython-959f3e50322467b9d894de67b118eb688753f9f1.zip
cpython-959f3e50322467b9d894de67b118eb688753f9f1.tar.gz
cpython-959f3e50322467b9d894de67b118eb688753f9f1.tar.bz2
Merged revisions 76138,76173 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76138 | antoine.pitrou | 2009-11-06 23:41:14 +0100 (ven., 06 nov. 2009) | 10 lines Merged revisions 76137 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76137 | antoine.pitrou | 2009-11-06 23:34:35 +0100 (ven., 06 nov. 2009) | 4 lines Issue #7270: Add some dedicated unit tests for multi-thread synchronization primitives such as Lock, RLock, Condition, Event and Semaphore. ........ ................ r76173 | antoine.pitrou | 2009-11-09 17:08:16 +0100 (lun., 09 nov. 2009) | 11 lines Merged revisions 76172 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76172 | antoine.pitrou | 2009-11-09 17:00:11 +0100 (lun., 09 nov. 2009) | 5 lines Issue #7282: Fix a memory leak when an RLock was used in a thread other than those started through `threading.Thread` (for example, using `thread.start_new_thread()`. ........ ................
Diffstat (limited to 'Lib/test/test_thread.py')
-rw-r--r--Lib/test/test_thread.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/test/test_thread.py b/Lib/test/test_thread.py
index 73d87b8..f6ce1ae 100644
--- a/Lib/test/test_thread.py
+++ b/Lib/test/test_thread.py
@@ -5,6 +5,7 @@ from test import support
import _thread as thread
import time
+from test import lock_tests
NUMTASKS = 10
NUMTRIPS = 3
@@ -161,8 +162,12 @@ class BarrierTest(BasicThreadTest):
if finished:
self.done_mutex.release()
+class LockTests(lock_tests.LockTests):
+ locktype = thread.allocate_lock
+
+
def test_main():
- support.run_unittest(ThreadRunningTests, BarrierTest)
+ support.run_unittest(ThreadRunningTests, BarrierTest, LockTests)
if __name__ == "__main__":
test_main()