mirror of
https://github.com/python/cpython.git
synced 2025-10-14 10:53:40 +00:00
Merged revisions 73715 via svnmerge from
svn+ssh://svn.python.org/python/branches/py3k ........ r73715 | benjamin.peterson | 2009-07-01 01:06:06 +0200 (Mi, 01 Jul 2009) | 1 line convert old fail* assertions to assert* ........
This commit is contained in:
parent
ef82be368a
commit
ab91fdef1f
274 changed files with 4538 additions and 4538 deletions
|
@ -24,7 +24,7 @@ class CAPITest(unittest.TestCase):
|
|||
def test_instancemethod(self):
|
||||
inst = InstanceMethod()
|
||||
self.assertEqual(id(inst), inst.id())
|
||||
self.assert_(inst.testfunction() is inst)
|
||||
self.assertTrue(inst.testfunction() is inst)
|
||||
self.assertEqual(inst.testfunction.__doc__, testfunction.__doc__)
|
||||
self.assertEqual(InstanceMethod.testfunction.__doc__, testfunction.__doc__)
|
||||
|
||||
|
@ -64,7 +64,7 @@ class TestPendingCalls(unittest.TestCase):
|
|||
if context and not context.event.is_set():
|
||||
continue
|
||||
count += 1
|
||||
self.failUnless(count < 10000,
|
||||
self.assertTrue(count < 10000,
|
||||
"timeout waiting for %i callbacks, got %i"%(n, len(l)))
|
||||
if False and support.verbose:
|
||||
print("(%i)"%(len(l),))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue