[Zope-Checkins] CVS: Zope2 - ConflictResolution.py:1.3

[jeremy@digicool.com]

Update of /cvs-repository/Zope2/lib/python/ZODB/tests
In directory korak:/tmp/cvs-serv16286/tests

Modified Files:
	ConflictResolution.py 
Log Message:
Put the conflict resolution test involving transactional undo in
separate class



--- Updated File ConflictResolution.py in package Zope2/lib/python/ZODB --
--- ConflictResolution.py	2001/05/02 21:19:35	1.2
+++ ConflictResolution.py	2001/05/08 21:30:55	1.3
@@ -122,6 +122,8 @@
                           self._dostoreNP,
                           oid, revid=revid1, data=zodb_pickle(obj))
 
+class ConflictResolvingTransUndoStorage:
+
     def checkUndoConflictResolution(self):
         # This test is based on checkNotUndoable in the
         # TransactionalUndoStorage test suite.  Except here, conflict



--- Updated File ConflictResolution.py in package Zope2 --
--- ConflictResolution.py	2001/05/02 21:19:35	1.2
+++ ConflictResolution.py	2001/05/08 21:30:55	1.3
@@ -122,6 +122,8 @@
                           self._dostoreNP,
                           oid, revid=revid1, data=zodb_pickle(obj))
 
+class ConflictResolvingTransUndoStorage:
+
     def checkUndoConflictResolution(self):
         # This test is based on checkNotUndoable in the
         # TransactionalUndoStorage test suite.  Except here, conflict