summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_dircache.py
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2010-11-21 13:34:58 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2010-11-21 13:34:58 (GMT)
commit2623a37852153363335956afab010cb0beb7e74e (patch)
treee443a19bb7a87adc2158ef2e32da5c2f3b21936c /Lib/test/test_dircache.py
parent40a92f5c65767d80ebc3b3be2c2ccfc5db3afb7b (diff)
downloadcpython-2623a37852153363335956afab010cb0beb7e74e.zip
cpython-2623a37852153363335956afab010cb0beb7e74e.tar.gz
cpython-2623a37852153363335956afab010cb0beb7e74e.tar.bz2
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. ........
Diffstat (limited to 'Lib/test/test_dircache.py')
-rw-r--r--Lib/test/test_dircache.py6
1 files changed, 3 insertions, 3 deletions
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 @@ class DircacheTests(unittest.TestCase):
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 @@ class DircacheTests(unittest.TestCase):
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 @@ class DircacheTests(unittest.TestCase):
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():