summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2008-07-13 01:19:15 (GMT)
committerBrett Cannon <bcannon@gmail.com>2008-07-13 01:19:15 (GMT)
commit40c8f23a25b48b6fd79025fdfcd84190fe1a8a1f (patch)
tree56bf4873990ff3a763265447c1312f3a37023f4e /Lib/test
parent91b3d8d54724a8fd816b900f6156e0ad45867cf8 (diff)
downloadcpython-40c8f23a25b48b6fd79025fdfcd84190fe1a8a1f.zip
cpython-40c8f23a25b48b6fd79025fdfcd84190fe1a8a1f.tar.gz
cpython-40c8f23a25b48b6fd79025fdfcd84190fe1a8a1f.tar.bz2
Merged revisions 64903 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r64903 | brett.cannon | 2008-07-12 18:15:07 -0700 (Sat, 12 Jul 2008) | 6 lines dummy_thread.acquire() would return None if no waitflag argument was given. It should have returned True. Fixes issue #3339. Thanks, Henk Punt for the report and Andrii v. Mishkovskiyi for attempting a patch. ........
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_dummy_thread.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/Lib/test/test_dummy_thread.py b/Lib/test/test_dummy_thread.py
index 5b7db18..ecac3ee 100644
--- a/Lib/test/test_dummy_thread.py
+++ b/Lib/test/test_dummy_thread.py
@@ -60,6 +60,7 @@ class LockTests(unittest.TestCase):
#Make sure that an unconditional locking returns True.
self.failUnless(self.lock.acquire(1) is True,
"Unconditional locking did not return True.")
+ self.failUnless(self.lock.acquire() is True)
def test_uncond_acquire_blocking(self):
#Make sure that unconditional acquiring of a locked lock blocks.