From a5c6d7fce282188bf3362c3a46beb40a9d6e32fa Mon Sep 17 00:00:00 2001 From: Christoph Gohlke Date: Wed, 1 Mar 2017 10:52:20 -0800 Subject: [PATCH] TST: fix PendingDeprecationWarning: Please use assertTrue instead --- tests/dbapi20.py | 88 ++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/tests/dbapi20.py b/tests/dbapi20.py index f707c090..8508e1f1 100644 --- a/tests/dbapi20.py +++ b/tests/dbapi20.py @@ -171,7 +171,7 @@ class DatabaseAPI20Test(unittest.TestCase): # Must exist threadsafety = self.driver.threadsafety # Must be a valid value - self.failUnless(threadsafety in (0,1,2,3)) + self.assertTrue(threadsafety in (0,1,2,3)) except AttributeError: self.fail("Driver doesn't define threadsafety") @@ -180,7 +180,7 @@ class DatabaseAPI20Test(unittest.TestCase): # Must exist paramstyle = self.driver.paramstyle # Must be a valid value - self.failUnless(paramstyle in ( + self.assertTrue(paramstyle in ( 'qmark','numeric','named','format','pyformat' )) except AttributeError: @@ -190,31 +190,31 @@ class DatabaseAPI20Test(unittest.TestCase): # Make sure required exceptions exist, and are in the # defined hierarchy. if sys.version[0] == '3': #under Python 3 StardardError no longer exists - self.failUnless(issubclass(self.driver.Warning,Exception)) - self.failUnless(issubclass(self.driver.Error,Exception)) + self.assertTrue(issubclass(self.driver.Warning,Exception)) + self.assertTrue(issubclass(self.driver.Error,Exception)) else: - self.failUnless(issubclass(self.driver.Warning,StandardError)) - self.failUnless(issubclass(self.driver.Error,StandardError)) + self.assertTrue(issubclass(self.driver.Warning,StandardError)) + self.assertTrue(issubclass(self.driver.Error,StandardError)) - self.failUnless( + self.assertTrue( issubclass(self.driver.InterfaceError,self.driver.Error) ) - self.failUnless( + self.assertTrue( issubclass(self.driver.DatabaseError,self.driver.Error) ) - self.failUnless( + self.assertTrue( issubclass(self.driver.OperationalError,self.driver.Error) ) - self.failUnless( + self.assertTrue( issubclass(self.driver.IntegrityError,self.driver.Error) ) - self.failUnless( + self.assertTrue( issubclass(self.driver.InternalError,self.driver.Error) ) - self.failUnless( + self.assertTrue( issubclass(self.driver.ProgrammingError,self.driver.Error) ) - self.failUnless( + self.assertTrue( issubclass(self.driver.NotSupportedError,self.driver.Error) ) @@ -227,15 +227,15 @@ class DatabaseAPI20Test(unittest.TestCase): # by default. con = self._connect() drv = self.driver - self.failUnless(con.Warning is drv.Warning) - self.failUnless(con.Error is drv.Error) - self.failUnless(con.InterfaceError is drv.InterfaceError) - self.failUnless(con.DatabaseError is drv.DatabaseError) - self.failUnless(con.OperationalError is drv.OperationalError) - self.failUnless(con.IntegrityError is drv.IntegrityError) - self.failUnless(con.InternalError is drv.InternalError) - self.failUnless(con.ProgrammingError is drv.ProgrammingError) - self.failUnless(con.NotSupportedError is drv.NotSupportedError) + self.assertTrue(con.Warning is drv.Warning) + self.assertTrue(con.Error is drv.Error) + self.assertTrue(con.InterfaceError is drv.InterfaceError) + self.assertTrue(con.DatabaseError is drv.DatabaseError) + self.assertTrue(con.OperationalError is drv.OperationalError) + self.assertTrue(con.IntegrityError is drv.IntegrityError) + self.assertTrue(con.InternalError is drv.InternalError) + self.assertTrue(con.ProgrammingError is drv.ProgrammingError) + self.assertTrue(con.NotSupportedError is drv.NotSupportedError) def test_commit(self): @@ -327,12 +327,12 @@ class DatabaseAPI20Test(unittest.TestCase): cur.execute("insert into %sbooze values ('Victoria Bitter')" % ( self.table_prefix )) - self.failUnless(cur.rowcount in (-1,1), + self.assertTrue(cur.rowcount in (-1,1), 'cursor.rowcount should == number or rows inserted, or ' 'set to -1 after executing an insert statement' ) cur.execute("select name from %sbooze" % self.table_prefix) - self.failUnless(cur.rowcount in (-1,1), + self.assertTrue(cur.rowcount in (-1,1), 'cursor.rowcount should == number of rows returned, or ' 'set to -1 after executing a select statement' ) @@ -397,7 +397,7 @@ class DatabaseAPI20Test(unittest.TestCase): cur.execute("insert into %sbooze values ('Victoria Bitter')" % ( self.table_prefix )) - self.failUnless(cur.rowcount in (-1,1)) + self.assertTrue(cur.rowcount in (-1,1)) if self.driver.paramstyle == 'qmark': cur.execute( @@ -426,7 +426,7 @@ class DatabaseAPI20Test(unittest.TestCase): ) else: self.fail('Invalid paramstyle') - self.failUnless(cur.rowcount in (-1,1)) + self.assertTrue(cur.rowcount in (-1,1)) cur.execute('select name from %sbooze' % self.table_prefix) res = cur.fetchall() @@ -478,7 +478,7 @@ class DatabaseAPI20Test(unittest.TestCase): ) else: self.fail('Unknown paramstyle') - self.failUnless(cur.rowcount in (-1,2), + self.assertTrue(cur.rowcount in (-1,2), 'insert using cursor.executemany set cursor.rowcount to ' 'incorrect value %r' % cur.rowcount ) @@ -513,7 +513,7 @@ class DatabaseAPI20Test(unittest.TestCase): 'cursor.fetchone should return None if a query retrieves ' 'no rows' ) - self.failUnless(cur.rowcount in (-1,0)) + self.assertTrue(cur.rowcount in (-1,0)) # cursor.fetchone should raise an Error if called after # executing a query that cannot return rows @@ -533,7 +533,7 @@ class DatabaseAPI20Test(unittest.TestCase): self.assertEqual(cur.fetchone(),None, 'cursor.fetchone should return None if no more rows available' ) - self.failUnless(cur.rowcount in (-1,1)) + self.assertTrue(cur.rowcount in (-1,1)) finally: con.close() @@ -589,7 +589,7 @@ class DatabaseAPI20Test(unittest.TestCase): 'cursor.fetchmany should return an empty sequence after ' 'results are exhausted' ) - self.failUnless(cur.rowcount in (-1,6)) + self.assertTrue(cur.rowcount in (-1,6)) # Same as above, using cursor.arraysize cur.arraysize=4 @@ -602,12 +602,12 @@ class DatabaseAPI20Test(unittest.TestCase): self.assertEqual(len(r),2) r = cur.fetchmany() # Should be an empty sequence self.assertEqual(len(r),0) - self.failUnless(cur.rowcount in (-1,6)) + self.assertTrue(cur.rowcount in (-1,6)) cur.arraysize=6 cur.execute('select name from %sbooze' % self.table_prefix) rows = cur.fetchmany() # Should get all rows - self.failUnless(cur.rowcount in (-1,6)) + self.assertTrue(cur.rowcount in (-1,6)) self.assertEqual(len(rows),6) self.assertEqual(len(rows),6) rows = [r[0] for r in rows] @@ -624,7 +624,7 @@ class DatabaseAPI20Test(unittest.TestCase): 'cursor.fetchmany should return an empty sequence if ' 'called after the whole result set has been fetched' ) - self.failUnless(cur.rowcount in (-1,6)) + self.assertTrue(cur.rowcount in (-1,6)) self.executeDDL2(cur) cur.execute('select name from %sbarflys' % self.table_prefix) @@ -633,7 +633,7 @@ class DatabaseAPI20Test(unittest.TestCase): 'cursor.fetchmany should return an empty sequence if ' 'query retrieved no rows' ) - self.failUnless(cur.rowcount in (-1,0)) + self.assertTrue(cur.rowcount in (-1,0)) finally: con.close() @@ -657,7 +657,7 @@ class DatabaseAPI20Test(unittest.TestCase): cur.execute('select name from %sbooze' % self.table_prefix) rows = cur.fetchall() - self.failUnless(cur.rowcount in (-1,len(self.samples))) + self.assertTrue(cur.rowcount in (-1,len(self.samples))) self.assertEqual(len(rows),len(self.samples), 'cursor.fetchall did not retrieve all rows' ) @@ -673,12 +673,12 @@ class DatabaseAPI20Test(unittest.TestCase): 'cursor.fetchall should return an empty list if called ' 'after the whole result set has been fetched' ) - self.failUnless(cur.rowcount in (-1,len(self.samples))) + self.assertTrue(cur.rowcount in (-1,len(self.samples))) self.executeDDL2(cur) cur.execute('select name from %sbarflys' % self.table_prefix) rows = cur.fetchall() - self.failUnless(cur.rowcount in (-1,0)) + self.assertTrue(cur.rowcount in (-1,0)) self.assertEqual(len(rows),0, 'cursor.fetchall should return an empty list if ' 'a select query returns no rows' @@ -700,7 +700,7 @@ class DatabaseAPI20Test(unittest.TestCase): rows23 = cur.fetchmany(2) rows4 = cur.fetchone() rows56 = cur.fetchall() - self.failUnless(cur.rowcount in (-1,6)) + self.assertTrue(cur.rowcount in (-1,6)) self.assertEqual(len(rows23),2, 'fetchmany returned incorrect number of rows' ) @@ -777,7 +777,7 @@ class DatabaseAPI20Test(unittest.TestCase): con = self._connect() try: cur = con.cursor() - self.failUnless(hasattr(cur,'arraysize'), + self.assertTrue(hasattr(cur,'arraysize'), 'cursor.arraysize must be defined' ) finally: @@ -846,27 +846,27 @@ class DatabaseAPI20Test(unittest.TestCase): b = self.driver.Binary(str2bytes('')) def test_STRING(self): - self.failUnless(hasattr(self.driver,'STRING'), + self.assertTrue(hasattr(self.driver,'STRING'), 'module.STRING must be defined' ) def test_BINARY(self): - self.failUnless(hasattr(self.driver,'BINARY'), + self.assertTrue(hasattr(self.driver,'BINARY'), 'module.BINARY must be defined.' ) def test_NUMBER(self): - self.failUnless(hasattr(self.driver,'NUMBER'), + self.assertTrue(hasattr(self.driver,'NUMBER'), 'module.NUMBER must be defined.' ) def test_DATETIME(self): - self.failUnless(hasattr(self.driver,'DATETIME'), + self.assertTrue(hasattr(self.driver,'DATETIME'), 'module.DATETIME must be defined.' ) def test_ROWID(self): - self.failUnless(hasattr(self.driver,'ROWID'), + self.assertTrue(hasattr(self.driver,'ROWID'), 'module.ROWID must be defined.' )