[Zodb-checkins] CVS: ZODB3/ZODB/tests - ConflictResolution.py:1.10.36.3

[Jeremy Hylton]

Update of /cvs-repository/ZODB3/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv13588/ZODB/tests

Modified Files:
      Tag: zodb33-devel-branch
	ConflictResolution.py 
Log Message:
Change ConflictError to include the name of the object's class.


=== ZODB3/ZODB/tests/ConflictResolution.py 1.10.36.2 => 1.10.36.3 ===
--- ZODB3/ZODB/tests/ConflictResolution.py:1.10.36.2	Tue Oct 28 16:28:33 2003
+++ ZODB3/ZODB/tests/ConflictResolution.py	Thu Oct 30 15:16:56 2003
@@ -94,9 +94,12 @@
         # pickle is to commit two different transactions relative to
         # revid1 that add two to _value.
         revid2 = self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
-        self.assertRaises(ConflictError,
-                          self._dostoreNP,
-                          oid, revid=revid1, data=zodb_pickle(obj))
+        try:
+            self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
+        except ConflictError, err:
+            self.assert_("PCounter2" in str(err))
+        else:
+            self.fail("Expected ConflictError")
 
     def checkZClassesArentResolved(self):
         from ZODB.ConflictResolution import bad_class