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.
........
This commit is contained in:
Ezio Melotti 2010-11-21 13:34:58 +00:00
parent 40a92f5c65
commit 2623a37852
184 changed files with 2328 additions and 2326 deletions

View file

@ -148,7 +148,7 @@ class MhlibTests(unittest.TestCase):
writeCurMessage('inbox', 2)
mh = getMH()
eq = self.assertEquals
eq = self.assertEqual
eq(mh.getprofile('Editor'), 'emacs')
eq(mh.getprofile('not-set'), None)
eq(mh.getpath(), os.path.abspath(_mhpath))
@ -171,7 +171,7 @@ class MhlibTests(unittest.TestCase):
def test_listfolders(self):
mh = getMH()
eq = self.assertEquals
eq = self.assertEqual
folders = mh.listfolders()
folders.sort()
@ -198,7 +198,7 @@ class MhlibTests(unittest.TestCase):
def test_sequence(self):
mh = getMH()
eq = self.assertEquals
eq = self.assertEqual
writeCurMessage('wide', 55)
f = mh.openfolder('wide')
@ -253,7 +253,7 @@ class MhlibTests(unittest.TestCase):
def test_modify(self):
mh = getMH()
eq = self.assertEquals
eq = self.assertEqual
mh.makefolder("dummy1")
self.assertIn("dummy1", mh.listfolders())
@ -315,7 +315,7 @@ class MhlibTests(unittest.TestCase):
def test_read(self):
mh = getMH()
eq = self.assertEquals
eq = self.assertEqual
f = mh.openfolder('inbox')
msg = f.openmessage(1)