test: replace deprecated methods

assertRaisesRegexp and assertEquals were renamed in version 3.2 [1].

1. https://docs.python.org/3/library/unittest.html#deprecated-aliases

Part of #250

Author: DifferentialOrange

test/suites/test_dml.py

@@ -124,7 +124,7 @@ def test_03_delete(self):
         self.assertSequenceEqual(self.con.delete('space_1', [20]), [])
         self.assertSequenceEqual(self.con.select('space_1', [20], index='primary'), [])
         # Check that <index_id> field has no meaning, yet.
-        with self.assertRaisesRegexp(tarantool.DatabaseError,
+        with self.assertRaisesRegex(tarantool.DatabaseError,
                 '(19, .*)'):
                 self.con.delete('space_1', [1, 'tuple_21'])
         self.assertSequenceEqual(self.con.select('space_1', [21], index='primary'), [[21, 1, 'tuple_21']])
@@ -134,7 +134,7 @@ def test_04_replace(self):
         self.assertSequenceEqual(self.con.replace('space_1', [2, 2, 'tuple_3']), [[2, 2, 'tuple_3']])
         self.assertSequenceEqual(self.con.select('space_1', 2), [[2, 2, 'tuple_3']])
         # Check replace that isn't Ok.
-        with self.assertRaisesRegexp(tarantool.DatabaseError,
+        with self.assertRaisesRegex(tarantool.DatabaseError,
                 '(39, .*)'):
             self.assertSequenceEqual(self.con.replace('space_1', [2, 2]), [[2, 2, 'tuple_2']])
 
@@ -168,9 +168,9 @@ def test_07_call_16(self):
         self.assertSequenceEqual(con.call('json.decode', '[123, 234, 345]'), [[123, 234, 345]])
         self.assertSequenceEqual(con.call('json.decode', ['[123, 234, 345]']), [[123, 234, 345]])
         self.assertSequenceEqual(con.call('json.decode', ('[123, 234, 345]',)), [[123, 234, 345]])
-        with self.assertRaisesRegexp(tarantool.DatabaseError, '(32, .*)'):
+        with self.assertRaisesRegex(tarantool.DatabaseError, '(32, .*)'):
             con.call('json.decode')
-        with self.assertRaisesRegexp(tarantool.DatabaseError, '(32, .*)'):
+        with self.assertRaisesRegex(tarantool.DatabaseError, '(32, .*)'):
             con.call('json.decode', '{[1, 2]: "world"}')
         ans = con.call('fiber.time')
         self.assertEqual(len(ans), 1)
@@ -194,9 +194,9 @@ def test_07_call_17(self):
         self.assertSequenceEqual(con.call('json.decode', '[123, 234, 345]'), [[123, 234, 345]])
         self.assertSequenceEqual(con.call('json.decode', ['[123, 234, 345]']), [[123, 234, 345]])
         self.assertSequenceEqual(con.call('json.decode', ('[123, 234, 345]',)), [[123, 234, 345]])
-        with self.assertRaisesRegexp(tarantool.DatabaseError, '(32, .*)'):
+        with self.assertRaisesRegex(tarantool.DatabaseError, '(32, .*)'):
             con.call('json.decode')
-        with self.assertRaisesRegexp(tarantool.DatabaseError, '(32, .*)'):
+        with self.assertRaisesRegex(tarantool.DatabaseError, '(32, .*)'):
             con.call('json.decode', '{[1, 2]: "world"}')
         ans = con.call('fiber.time')
         self.assertEqual(len(ans), 1)

test/suites/test_pool.py

@@ -520,11 +520,11 @@ def test_16_is_closed(self):
             user='test',
             password='test',)
 
-        self.assertEquals(self.pool.is_closed(), False)
+        self.assertEqual(self.pool.is_closed(), False)
 
         self.pool.close()
 
-        self.assertEquals(self.pool.is_closed(), True)
+        self.assertEqual(self.pool.is_closed(), True)
 
     def tearDown(self):
         if hasattr(self, 'pool'):

test/suites/test_schema.py

@@ -104,30 +104,30 @@ def test_00_authenticate(self):
         self.assertEqual(self.con.authenticate('test', 'test')._data, None)
 
     def test_01_space_bad(self):
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no space.*'):
             self.sch.get_space(0)
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no space.*'):
             self.sch.get_space(0)
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no space.*'):
             self.sch.get_space('bad_name')
 
     def test_02_index_bad(self):
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no space.*'):
             self.sch.get_index(0, 'primary')
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no space.*'):
             self.sch.get_index('bad_space', 'primary')
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no index.*'):
             self.sch.get_index(280, 'bad_index')
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no index.*'):
             self.sch.get_index(280, 'bad_index')
-        with self.assertRaisesRegexp(tarantool.SchemaError,
+        with self.assertRaisesRegex(tarantool.SchemaError,
                 'There\'s no index.*'):
             self.sch.get_index(280, 3)