Replace deprecated assertEquals with assertEqual and failUnlessRaises

with assertRaises.

Author: rouilj

test/session_common.py

@@ -31,7 +31,7 @@ def testGetAll(self):
 
     def testDestroy(self):
         self.sessions.set('random_key', text='hello, world!')
-        self.assertEquals(self.sessions.getall('random_key'),
+        self.assertEqual(self.sessions.getall('random_key'),
             {'text': 'hello, world!'})
         self.sessions.destroy('random_key')
         self.assertRaises(KeyError, self.sessions.getall, 'random_key')

test/test_cgi.py

@@ -1217,7 +1217,7 @@ def data_set(self, key, **value):
 
     def testClassPermission(self):
         cl = self._make_client(dict(username='bob'))
-        self.failUnlessRaises(exceptions.Unauthorised,
+        self.assertRaises(exceptions.Unauthorised,
             actions.EditItemAction(cl).handle)
         cl.nodeid = '1'
         self.assertRaises(exceptions.Unauthorised,
@@ -1249,7 +1249,7 @@ def own_record(db, userid, itemid):
         self.assertRaises(exceptions.Redirect,
             actions.EditItemAction(cl).handle)
         cl = self._make_client({'password':'bob', '@confirm@password':'bob'})
-        self.failUnlessRaises(exceptions.Unauthorised,
+        self.assertRaises(exceptions.Unauthorised,
             actions.EditItemAction(cl).handle)
 
     def testCreatePermission(self):

test/test_config.py

@@ -51,7 +51,7 @@ def test_badConfigKeyword(self):
     def test_validConfigKeyword(self):
         """Run configure tests looking for invalid option name
         """
-        self.assertEquals(config._get_option("FOO"), "value")
+        self.assertEqual(config._get_option("FOO"), "value")
 
     def testTrackerWeb(self):
         config = configuration.CoreConfig()

test/test_mailer.py

@@ -5,7 +5,7 @@
 
 class EncodingTestCase(unittest.TestCase):
     def testEncoding(self):
-        a = lambda n, a, c, o: self.assertEquals(mailer.nice_sender_header(n,
+        a = lambda n, a, c, o: self.assertEqual(mailer.nice_sender_header(n,
             a, c), o)
         a('ascii', '[email protected]', 'iso8859-1', 'ascii <[email protected]>')
         a(u'café', '[email protected]', 'iso8859-1',

test/test_mailgw.py

@@ -2773,7 +2773,7 @@ def testNewUserAuthorEncodedName(self):
         m = set(self.db.user.list())
         new = list(m - l)[0]
         name = self.db.user.get(new, 'realname')
-        self.assertEquals(name, 'H€llo')
+        self.assertEqual(name, 'H€llo')
 
     def testNewUserAuthorMixedEncodedName(self):
         l = set(self.db.user.list())
@@ -2792,11 +2792,11 @@ def testNewUserAuthorMixedEncodedName(self):
         self._allowAnonymousSubmit()
         self._handle_mail(message)
         title = self.db.issue.get('1', 'title')
-        self.assertEquals(title, b2s(b'Test \xc3\x84\xc3\x96\xc3\x9c umlauts X1 X2'))
+        self.assertEqual(title, b2s(b'Test \xc3\x84\xc3\x96\xc3\x9c umlauts X1 X2'))
         m = set(self.db.user.list())
         new = list(m - l)[0]
         name = self.db.user.get(new, 'realname')
-        self.assertEquals(name, b2s(b'Firstname \xc3\xa4\xc3\xb6\xc3\x9f Last'))
+        self.assertEqual(name, b2s(b'Firstname \xc3\xa4\xc3\xb6\xc3\x9f Last'))
 
     def testNewUserAuthorMixedEncodedNameSpacing(self):
         l = set(self.db.user.list())
@@ -2814,11 +2814,11 @@ def testNewUserAuthorMixedEncodedNameSpacing(self):
         self._allowAnonymousSubmit()
         self._handle_mail(message)
         title = self.db.issue.get('1', 'title')
-        self.assertEquals(title, b2s(b'Test (\xc3\x84\xc3\x96\xc3\x9c) umlauts X1'))
+        self.assertEqual(title, b2s(b'Test (\xc3\x84\xc3\x96\xc3\x9c) umlauts X1'))
         m = set(self.db.user.list())
         new = list(m - l)[0]
         name = self.db.user.get(new, 'realname')
-        self.assertEquals(name,
+        self.assertEqual(name,
             b2s(b'(\xc3\xa4\xc3\xb6\xc3\x9f\xc3\xa4\xc3\xb6\xc3\x9f)'))
 
     def testUnknownUser(self):

test/test_security.py

@@ -75,17 +75,17 @@ def testGetPermission(self):
 
         # class
         ei = add(name="Edit", klass="issue")
-        self.assertEquals(get('Edit', 'issue'), ei)
+        self.assertEqual(get('Edit', 'issue'), ei)
         ai = add(name="View", klass="issue")
-        self.assertEquals(get('View', 'issue'), ai)
+        self.assertEqual(get('View', 'issue'), ai)
 
         # property
         epi1 = add(name="Edit", klass="issue", properties=['title'])
-        self.assertEquals(get('Edit', 'issue', properties=['title']), epi1)
+        self.assertEqual(get('Edit', 'issue', properties=['title']), epi1)
         epi2 = add(name="Edit", klass="issue", properties=['title'],
                   props_only=True)
-        self.assertEquals(get('Edit', 'issue', properties=['title'], props_only=False), epi1)
-        self.assertEquals(get('Edit', 'issue', properties=['title'], props_only=True), epi2)
+        self.assertEqual(get('Edit', 'issue', properties=['title'], props_only=False), epi1)
+        self.assertEqual(get('Edit', 'issue', properties=['title'], props_only=True), epi2)
         self.db.security.set_props_only_default(True)
         self.assertEquals(get('Edit', 'issue', properties=['title']), epi2)
         api1 = add(name="View", klass="issue", properties=['title'])