diff --git a/tests/capabilities.py b/tests/capabilities.py index cbbe24f..31aa398 100644 --- a/tests/capabilities.py +++ b/tests/capabilities.py @@ -91,11 +91,11 @@ class DatabaseTest(unittest.TestCase): # verify self.cursor.execute('select * from %s' % self.table) l = self.cursor.fetchall() - self.assertEquals(len(l), self.rows) + self.assertEqual(len(l), self.rows) try: for i in range(self.rows): for j in range(len(columndefs)): - self.assertEquals(l[i][j], generator(i,j)) + self.assertEqual(l[i][j], generator(i,j)) finally: if not self.debug: self.cursor.execute('drop table %s' % (self.table)) @@ -116,10 +116,10 @@ class DatabaseTest(unittest.TestCase): self.connection.commit() self.cursor.execute('select * from %s' % self.table) l = self.cursor.fetchall() - self.assertEquals(len(l), self.rows) + self.assertEqual(len(l), self.rows) for i in range(self.rows): for j in range(len(columndefs)): - self.assertEquals(l[i][j], generator(i,j)) + self.assertEqual(l[i][j], generator(i,j)) delete_statement = 'delete from %s where col1=%%s' % self.table self.cursor.execute(delete_statement, (0,)) self.cursor.execute('select col1 from %s where col1=%s' % \ diff --git a/tests/test_MySQLdb_capabilities.py b/tests/test_MySQLdb_capabilities.py index 23d7d9e..1ec32f7 100644 --- a/tests/test_MySQLdb_capabilities.py +++ b/tests/test_MySQLdb_capabilities.py @@ -56,8 +56,8 @@ class test_MySQLdb(capabilities.DatabaseTest): c.callproc('test_sp', ('larch',)) rows = c.fetchall() - self.assertEquals(len(rows), 1) - self.assertEquals(rows[0][0], 3) + self.assertEqual(len(rows), 1) + self.assertEqual(rows[0][0], 3) c.nextset() c.execute("DROP PROCEDURE test_sp") diff --git a/tests/test_MySQLdb_dbapi20.py b/tests/test_MySQLdb_dbapi20.py index d8598dd..3fef3f5 100644 --- a/tests/test_MySQLdb_dbapi20.py +++ b/tests/test_MySQLdb_dbapi20.py @@ -189,8 +189,8 @@ class test_MySQLdb(dbapi20.DatabaseAPI20Test): s=cur.nextset() if s: empty = cur.fetchall() - self.assertEquals(len(empty), 0, - "non-empty result set after other result sets") + self.assertEqual(len(empty), 0, + "non-empty result set after other result sets") #warn("Incompatibility: MySQL returns an empty result set for the CALL itself", # Warning) #assert s == None,'No more return sets, should return None' diff --git a/tests/test_MySQLdb_nonstandard.py b/tests/test_MySQLdb_nonstandard.py index 2ca5a54..7efe265 100644 --- a/tests/test_MySQLdb_nonstandard.py +++ b/tests/test_MySQLdb_nonstandard.py @@ -67,8 +67,8 @@ class CoreAPI(unittest.TestCase): "thread_id shouldn't accept arguments.") def test_affected_rows(self): - self.assertEquals(self.conn.affected_rows(), 0, - "Should return 0 before we do anything.") + self.assertEqual(self.conn.affected_rows(), 0, + "Should return 0 before we do anything.") #def test_debug(self):