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:
Georg Brandl 2009-08-13 08:51:18 +00:00
parent ef82be368a
commit ab91fdef1f
274 changed files with 4538 additions and 4538 deletions

View file

@ -188,9 +188,9 @@ class TestBasic(unittest.TestCase):
self.assertEqual(len(d), n-i)
j = random.randrange(-len(d), len(d))
val = d[j]
self.assert_(val in d)
self.assertTrue(val in d)
del d[j]
self.assert_(val not in d)
self.assertTrue(val not in d)
self.assertEqual(len(d), 0)
def test_rotate(self):
@ -291,7 +291,7 @@ class TestBasic(unittest.TestCase):
self.assertRaises(RuntimeError, d.remove, 'c')
for x, y in zip(d, e):
# verify that original order and values are retained.
self.assert_(x is y)
self.assertTrue(x is y)
# Handle evil mutator
for match in (True, False):
@ -305,7 +305,7 @@ class TestBasic(unittest.TestCase):
e = eval(repr(d))
self.assertEqual(list(d), list(e))
d.append(d)
self.assert_('...' in repr(d))
self.assertTrue('...' in repr(d))
def test_print(self):
d = deque(range(200))
@ -461,7 +461,7 @@ class TestBasic(unittest.TestCase):
obj.x = iter(container)
del obj, container
gc.collect()
self.assert_(ref() is None, "Cycle was not collected")
self.assertTrue(ref() is None, "Cycle was not collected")
class TestVariousIteratorArgs(unittest.TestCase):