Merge r73838 from py3k branch. Use the nondeprecated unittest method
names.
diff --git a/Lib/sqlite3/test/py25tests.py b/Lib/sqlite3/test/py25tests.py
index bce26b9..7fd3c0e 100644
--- a/Lib/sqlite3/test/py25tests.py
+++ b/Lib/sqlite3/test/py25tests.py
@@ -54,19 +54,19 @@
self.con.execute("insert into test(c) values ('foo')")
self.con.rollback()
count = self.con.execute("select count(*) from test").fetchone()[0]
- self.failUnlessEqual(count, 1)
+ self.assertEqual(count, 1)
def CheckContextManagerRollback(self):
"""Is a rollback called in the context manager?"""
global did_rollback
- self.failUnlessEqual(did_rollback, False)
+ self.assertEqual(did_rollback, False)
try:
with self.con:
self.con.execute("insert into test(c) values (4)")
self.con.execute("insert into test(c) values (4)")
except sqlite.IntegrityError:
pass
- self.failUnlessEqual(did_rollback, True)
+ self.assertEqual(did_rollback, True)
def suite():
ctx_suite = unittest.makeSuite(ContextTests, "Check")