From 690c699c2e0178c245db776e9988de56be30fe51 Mon Sep 17 00:00:00 2001 From: Tres Seaver Date: Fri, 15 Feb 2013 15:48:48 -0500 Subject: [PATCH] Fix Py3k namnyisms: 'fail{If,Unless}' -> 'assert{False,True}'. --- src/ZODB/scripts/manual_tests/testfstest.py | 2 +- src/ZODB/scripts/tests/test_repozo.py | 18 +++++++++--------- src/ZODB/tests/Corruption.py | 4 ++-- src/ZODB/tests/MTStorage.py | 3 ++- src/ZODB/tests/TransactionalUndoStorage.py | 6 +++--- src/ZODB/tests/testConnection.py | 4 ++-- src/ZODB/tests/testPersistentList.py | 16 ++++++++-------- src/ZODB/tests/testZODB.py | 6 +++--- src/ZODB/tests/testfsIndex.py | 2 +- 9 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/ZODB/scripts/manual_tests/testfstest.py b/src/ZODB/scripts/manual_tests/testfstest.py index b0a3d7d84..9f85b633a 100644 --- a/src/ZODB/scripts/manual_tests/testfstest.py +++ b/src/ZODB/scripts/manual_tests/testfstest.py @@ -41,7 +41,7 @@ def detectsError(self, rx): fstest.check(self._temp) except FormatError as msg: mo = re.search(rx, str(msg)) - self.failIf(mo is None, "unexpected error: %s" % msg) + self.assertFalse(mo is None, "unexpected error: %s" % msg) else: self.fail("fstest did not detect corruption") diff --git a/src/ZODB/scripts/tests/test_repozo.py b/src/ZODB/scripts/tests/test_repozo.py index 0521c7ba0..4af5b10d5 100644 --- a/src/ZODB/scripts/tests/test_repozo.py +++ b/src/ZODB/scripts/tests/test_repozo.py @@ -268,7 +268,7 @@ def close(self): ofp = Faux() bytes, sum = self._callFUT(files, ofp) self.assertEqual(ofp._written, [x.encode() for x in 'ABC']) - self.failUnless(ofp._closed) + self.assertTrue(ofp._closed) _marker = object() class Test_gen_filename(OptionsTestBase, unittest.TestCase): @@ -460,7 +460,7 @@ def test_no_repozo_files_doesnt_raise(self): self.assertEqual(len(remaining), len(FILENAMES)) for name in FILENAMES: fqn = os.path.join(self._repository_directory, name) - self.failUnless(os.path.isfile(fqn)) + self.assertTrue(os.path.isfile(fqn)) def test_doesnt_remove_current_repozo_files(self): FILENAMES = ['2009-12-20-10-08-03.fs', @@ -472,7 +472,7 @@ def test_doesnt_remove_current_repozo_files(self): self.assertEqual(len(remaining), len(FILENAMES)) for name in FILENAMES: fqn = os.path.join(self._repository_directory, name) - self.failUnless(os.path.isfile(fqn)) + self.assertTrue(os.path.isfile(fqn)) def test_removes_older_repozo_files(self): OLDER_FULL = ['2009-12-20-00-01-03.fs', @@ -494,13 +494,13 @@ def test_removes_older_repozo_files(self): self.assertEqual(len(remaining), len(CURRENT_FULL)) for name in OLDER_FULL: fqn = os.path.join(self._repository_directory, name) - self.failIf(os.path.isfile(fqn)) + self.assertFalse(os.path.isfile(fqn)) for name in DELTAS: fqn = os.path.join(self._repository_directory, name) - self.failIf(os.path.isfile(fqn)) + self.assertFalse(os.path.isfile(fqn)) for name in CURRENT_FULL: fqn = os.path.join(self._repository_directory, name) - self.failUnless(os.path.isfile(fqn)) + self.assertTrue(os.path.isfile(fqn)) def test_removes_older_repozo_files_zipped(self): OLDER_FULL = ['2009-12-20-00-01-03.fsz', @@ -522,13 +522,13 @@ def test_removes_older_repozo_files_zipped(self): self.assertEqual(len(remaining), len(CURRENT_FULL)) for name in OLDER_FULL: fqn = os.path.join(self._repository_directory, name) - self.failIf(os.path.isfile(fqn)) + self.assertFalse(os.path.isfile(fqn)) for name in DELTAS: fqn = os.path.join(self._repository_directory, name) - self.failIf(os.path.isfile(fqn)) + self.assertFalse(os.path.isfile(fqn)) for name in CURRENT_FULL: fqn = os.path.join(self._repository_directory, name) - self.failUnless(os.path.isfile(fqn)) + self.assertTrue(os.path.isfile(fqn)) class Test_do_full_backup(OptionsTestBase, unittest.TestCase): diff --git a/src/ZODB/tests/Corruption.py b/src/ZODB/tests/Corruption.py index d07639840..08b3f94cd 100644 --- a/src/ZODB/tests/Corruption.py +++ b/src/ZODB/tests/Corruption.py @@ -44,7 +44,7 @@ def checkTruncatedIndex(self): self._close() # truncation the index file - self.failUnless(os.path.exists('Data.fs.index')) + self.assertTrue(os.path.exists('Data.fs.index')) f = open('Data.fs.index', 'rb+') f.seek(0, 2) size = f.tell() @@ -60,7 +60,7 @@ def checkCorruptedIndex(self): self._close() # truncation the index file - self.failUnless(os.path.exists('Data.fs.index')) + self.assertTrue(os.path.exists('Data.fs.index')) size = os.stat('Data.fs.index')[stat.ST_SIZE] f = open('Data.fs.index', 'rb+') while f.tell() < size: diff --git a/src/ZODB/tests/MTStorage.py b/src/ZODB/tests/MTStorage.py index d2f730029..4ea139c17 100644 --- a/src/ZODB/tests/MTStorage.py +++ b/src/ZODB/tests/MTStorage.py @@ -220,7 +220,8 @@ def _checkNThreads(self, n, constructor, *args): for t in threads: t.join(60) for t in threads: - self.failIf(t.isAlive(), "thread failed to finish in 60 seconds") + self.assertFalse(t.isAlive(), + "thread failed to finish in 60 seconds") def check2ZODBThreads(self): db = ZODB.DB(self._storage) diff --git a/src/ZODB/tests/TransactionalUndoStorage.py b/src/ZODB/tests/TransactionalUndoStorage.py index 6171df3d8..a9490e1ff 100644 --- a/src/ZODB/tests/TransactionalUndoStorage.py +++ b/src/ZODB/tests/TransactionalUndoStorage.py @@ -249,7 +249,7 @@ def checkTwoObjectUndo(self): def checkTwoObjectUndoAtOnce(self): # Convenience eq = self.assertEqual - unless = self.failUnless + unless = self.assertTrue p30, p31, p32, p50, p51, p52 = map(zodb_pickle, map(MinPO, (30, 31, 32, 50, 51, 52))) @@ -357,8 +357,8 @@ def checkTwoObjectUndoAgain(self): oids = self._begin_undos_vote(t, tid) self._storage.tpc_finish(t) eq(len(oids), 1) - self.failUnless(oid1 in oids) - self.failUnless(not oid2 in oids) + self.assertTrue(oid1 in oids) + self.assertTrue(not oid2 in oids) data, revid1 = self._storage.load(oid1, '') eq(zodb_unpickle(data), MinPO(33)) data, revid2 = self._storage.load(oid2, '') diff --git a/src/ZODB/tests/testConnection.py b/src/ZODB/tests/testConnection.py index 5ee6c8508..4106dedf8 100644 --- a/src/ZODB/tests/testConnection.py +++ b/src/ZODB/tests/testConnection.py @@ -161,8 +161,8 @@ def check__resetCacheResetsReader(self): old_cache = self.datamgr._cache self.datamgr._resetCache() new_cache = self.datamgr._cache - self.failIf(new_cache is old_cache) - self.failUnless(self.datamgr._reader._cache is new_cache) + self.assertFalse(new_cache is old_cache) + self.assertTrue(self.datamgr._reader._cache is new_cache) class UserMethodTests(unittest.TestCase): diff --git a/src/ZODB/tests/testPersistentList.py b/src/ZODB/tests/testPersistentList.py index dd5506d23..6e6b47494 100644 --- a/src/ZODB/tests/testPersistentList.py +++ b/src/ZODB/tests/testPersistentList.py @@ -124,9 +124,9 @@ def mycmp(a, b): # Test __contains__ for i in u2: - self.failUnless(i in u2, "i in u2") + self.assertTrue(i in u2, "i in u2") for i in min(u2)-1, max(u2)+1: - self.failUnless(i not in u2, "i not in u2") + self.assertTrue(i not in u2, "i not in u2") # Test __delslice__ @@ -142,12 +142,12 @@ def mycmp(a, b): # Test __add__, __radd__, __mul__ and __rmul__ - #self.failUnless(u1 + [] == [] + u1 == u1, "u1 + [] == [] + u1 == u1") - self.failUnless(u1 + [1] == u2, "u1 + [1] == u2") - #self.failUnless([-1] + u1 == [-1, 0], "[-1] + u1 == [-1, 0]") - self.failUnless(u2 == u2*1 == 1*u2, "u2 == u2*1 == 1*u2") - self.failUnless(u2+u2 == u2*2 == 2*u2, "u2+u2 == u2*2 == 2*u2") - self.failUnless(u2+u2+u2 == u2*3 == 3*u2, "u2+u2+u2 == u2*3 == 3*u2") + #self.assertTrue(u1 + [] == [] + u1 == u1, "u1 + [] == [] + u1 == u1") + self.assertTrue(u1 + [1] == u2, "u1 + [1] == u2") + #self.assertTrue([-1] + u1 == [-1, 0], "[-1] + u1 == [-1, 0]") + self.assertTrue(u2 == u2*1 == 1*u2, "u2 == u2*1 == 1*u2") + self.assertTrue(u2+u2 == u2*2 == 2*u2, "u2+u2 == u2*2 == 2*u2") + self.assertTrue(u2+u2+u2 == u2*3 == 3*u2, "u2+u2+u2 == u2*3 == 3*u2") # Test append diff --git a/src/ZODB/tests/testZODB.py b/src/ZODB/tests/testZODB.py index f6138c50e..4193a219f 100644 --- a/src/ZODB/tests/testZODB.py +++ b/src/ZODB/tests/testZODB.py @@ -100,7 +100,7 @@ def verify(self, conn, abort_it): else: raise else: - self.failUnless(not abort_it, 'Did not abort duplication') + self.assertTrue(not abort_it, 'Did not abort duplication') l1 = list(ob.items()) l1.sort() l2 = list(ob2.items()) @@ -560,8 +560,8 @@ def checkReadConflictErrorClearedDuringAbort(self): # but 3.2.3 had a bug wherein it did. data_conflicts = data._p_jar._conflicts data2_conflicts = data2._p_jar._conflicts - self.failIf(data_conflicts) - self.failIf(data2_conflicts) # this used to fail + self.assertFalse(data_conflicts) + self.assertFalse(data2_conflicts) # this used to fail # And because of that, we still couldn't commit a change to data2['d'] # in the new transaction. diff --git a/src/ZODB/tests/testfsIndex.py b/src/ZODB/tests/testfsIndex.py index 9955cdfac..5503f4d18 100644 --- a/src/ZODB/tests/testfsIndex.py +++ b/src/ZODB/tests/testfsIndex.py @@ -68,7 +68,7 @@ def testInserts(self): self.assertEqual(index.get(key), None) self.assertEqual(index.get(key, ''), '') - # self.failUnless(len(index._data) > 1) + # self.assertTrue(len(index._data) > 1) def testUpdate(self): index = self.index