Merged revisions 86596 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r86596 | ezio.melotti | 2010-11-20 21:04:17 +0200 (Sat, 20 Nov 2010) | 1 line
#9424: Replace deprecated assert* methods in the Python test suite.
........
diff --git a/Lib/test/test_dircache.py b/Lib/test/test_dircache.py
index 8a80720..c6ad31c 100644
--- a/Lib/test/test_dircache.py
+++ b/Lib/test/test_dircache.py
@@ -35,7 +35,7 @@
def test_listdir(self):
## SUCCESSFUL CASES
entries = dircache.listdir(self.tempdir)
- self.assertEquals(entries, [])
+ self.assertEqual(entries, [])
# Check that cache is actually caching, not just passing through.
self.assertTrue(dircache.listdir(self.tempdir) is entries)
@@ -52,7 +52,7 @@
time.sleep(1)
self.writeTemp("test1")
entries = dircache.listdir(self.tempdir)
- self.assertEquals(entries, ['test1'])
+ self.assertEqual(entries, ['test1'])
self.assertTrue(dircache.listdir(self.tempdir) is entries)
## UNSUCCESSFUL CASES
@@ -63,7 +63,7 @@
self.mkdirTemp("A")
lst = ['A', 'test2', 'test_nonexistent']
dircache.annotate(self.tempdir, lst)
- self.assertEquals(lst, ['A/', 'test2', 'test_nonexistent'])
+ self.assertEqual(lst, ['A/', 'test2', 'test_nonexistent'])
def test_main():