[Zodb-checkins] CVS: Packages/bsddb3Storage - test_storage_api.py:1.14

[barry@digicool.com]

Update of /cvs-repository/Packages/bsddb3Storage/bsddb3Storage/tests
In directory korak.digicool.com:/tmp/cvs-serv13165

Modified Files:
	test_storage_api.py 
Log Message:
FullTest(): Added mixin classes ConflictResolvingStorage and
ConflictResolvingTransUndoStorage to ensure that the Full storage
passes the application level conflict resolution tests.  It does!



--- Updated File test_storage_api.py in package Packages/bsddb3Storage --
--- test_storage_api.py	2001/06/14 20:49:20	1.13
+++ test_storage_api.py	2001/06/18 18:50:40	1.14
@@ -13,6 +13,7 @@
 from ZODB.tests.PackableStorage import PackableStorage
 from ZODB.tests.HistoryStorage import HistoryStorage
 from ZODB.tests.IteratorStorage import IteratorStorage
+from ZODB.tests import ConflictResolution
 
 
 
@@ -33,7 +34,9 @@
 
 class FullTest(BerkeleyTestBase.FullTestBase, BasicStorage, VersionStorage,
                TransactionalUndoStorage, TransactionalUndoVersionStorage,
-               PackableStorage, HistoryStorage, IteratorStorage):
+               PackableStorage, HistoryStorage, IteratorStorage,
+               ConflictResolution.ConflictResolvingStorage,
+               ConflictResolution.ConflictResolvingTransUndoStorage):
     pass