[Zope3-checkins] CVS: Zope3/src/zodb/btrees/tests - test_conflict.py:1.10

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb/btrees/tests
In directory cvs.zope.org:/tmp/cvs-serv20804

Modified Files:
	test_conflict.py 
Log Message:
Other ConflictError cleanup makes this workaround unnecessary.


=== Zope3/src/zodb/btrees/tests/test_conflict.py 1.9 => 1.10 ===
--- Zope3/src/zodb/btrees/tests/test_conflict.py:1.9	Sun Jan 12 14:54:46 2003
+++ Zope3/src/zodb/btrees/tests/test_conflict.py	Wed Jan 15 14:15:30 2003
@@ -517,9 +517,6 @@
         self.assertEqual(state[0][1], 60)
         self.assertEqual(state[0][3], 120)
 
-        # XXX The ConflictError imported at the top of this module isn't
-        # XXX the ConflictError that gets raised here.
-        from zodb.interfaces import ConflictError
         self.assertRaises(ConflictError, get_transaction().commit)
         get_transaction().abort()   # horrible things happen w/o this