[Zodb-checkins] CVS: ZODB4/ZODB/tests - testZODB.py:1.14

Jeremy Hylton jeremy@zope.com
Fri, 13 Dec 2002 17:20:43 -0500


Update of /cvs-repository/ZODB4/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv29336/ZODB/tests

Modified Files:
	testZODB.py 
Log Message:
Resolve MRO conflict among bases.


=== ZODB4/ZODB/tests/testZODB.py 1.13 => 1.14 ===
--- ZODB4/ZODB/tests/testZODB.py:1.13	Wed Dec  4 16:57:58 2002
+++ ZODB4/ZODB/tests/testZODB.py	Fri Dec 13 17:20:43 2002
@@ -101,8 +101,8 @@
     def checkDuplicateAborted(self):
         self.checkDuplicate(abort_it=True, dup_name='test_duplicate_aborted')
 
-class ZODBTests(unittest.TestCase, ExportImportTests,
-                TransactionalUndoDB):
+class ZODBTests(ExportImportTests, TransactionalUndoDB,
+                unittest.TestCase):
 
     def setUp(self):
         self._db = ZODB.FileStorage.DB(_fsname, create=1)