[Zope3-checkins] CVS: Zope3/lib/python/ZODB/tests - testFileStorage.py:1.21

[Jeremy Hylton]

Update of /cvs-repository/Zope3/lib/python/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv10398

Modified Files:
	testFileStorage.py 
Log Message:
Forgot to mixin one set of conflict resolution tests.


=== Zope3/lib/python/ZODB/tests/testFileStorage.py 1.20 => 1.21 ===
--- Zope3/lib/python/ZODB/tests/testFileStorage.py:1.20	Mon Nov 25 14:54:50 2002
+++ Zope3/lib/python/ZODB/tests/testFileStorage.py	Mon Dec  2 16:58:55 2002
@@ -35,6 +35,7 @@
     PackableStorage.PackableStorage,
     Synchronization.SynchronizedStorage,
     ConflictResolution.ConflictResolvingStorage,
+    ConflictResolution.ConflictResolvingTransUndoStorage,
     HistoryStorage.HistoryStorage,
     IteratorStorage.IteratorStorage,
     IteratorStorage.ExtendedIteratorStorage,