diff options
| author | Georg Brandl <georg@python.org> | 2009-08-13 08:51:18 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-08-13 08:51:18 (GMT) |
| commit | ab91fdef1f1e556203a2eee98ba7d379e4790de9 (patch) | |
| tree | 6f8f00dc18cc5f2801a675df277c2c595eb85ec8 /Lib/test/test_capi.py | |
| parent | ef82be368abdea8e8032500e7ecc3a22f5f07851 (diff) | |
| download | cpython-ab91fdef1f1e556203a2eee98ba7d379e4790de9.zip cpython-ab91fdef1f1e556203a2eee98ba7d379e4790de9.tar.gz cpython-ab91fdef1f1e556203a2eee98ba7d379e4790de9.tar.bz2 | |
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*
........
Diffstat (limited to 'Lib/test/test_capi.py')
| -rw-r--r-- | Lib/test/test_capi.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index d3d2226..0460679 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -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),)) |