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

[Guido van Rossum]

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

Modified Files:
	ConflictResolution.py 
Log Message:
Merge changes from ZODB3 3.1 final release. Bump version to 3.1+.

=== ZODB3/ZODB/tests/ConflictResolution.py 1.8 => 1.9 ===
--- ZODB3/ZODB/tests/ConflictResolution.py:1.8	Wed Aug 14 18:07:09 2002
+++ ZODB3/ZODB/tests/ConflictResolution.py	Wed Oct 30 13:58:29 2002
@@ -104,7 +104,7 @@
         # 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(AttributeError,
+        self.assertRaises(ConflictError,
                           self._dostoreNP,
                           oid, revid=revid1, data=zodb_pickle(obj))
 
@@ -122,7 +122,7 @@
         # 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(TypeError,
+        self.assertRaises(ConflictError,
                           self._dostoreNP,
                           oid, revid=revid1, data=zodb_pickle(obj))