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

[Jim Fulton]

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

Modified Files:
      Tag: zope3-zodb3-devel-branch
	ConflictResolution.py 
Log Message:
Updated to reflect the new serialization format.


=== ZODB3/ZODB/tests/ConflictResolution.py 1.12 => 1.12.8.1 ===
--- ZODB3/ZODB/tests/ConflictResolution.py:1.12	Fri Nov 28 11:44:54 2003
+++ ZODB3/ZODB/tests/ConflictResolution.py	Fri Jan 23 15:44:23 2004
@@ -102,9 +102,9 @@
             self.fail("Expected ConflictError")
 
     def checkZClassesArentResolved(self):
-        from ZODB.ConflictResolution import bad_class
+        from ZODB.ConflictResolution import find_global, BadClassName
         dummy_class_tuple = ('*foobar', ())
-        assert bad_class(dummy_class_tuple) == 1
+        self.assertRaises(BadClassName, find_global, '*foobar', ())
 
     def checkBuggyResolve1(self):
         obj = PCounter3()