[Zope3-checkins] CVS: Zope3/src/zodb/code/tests - test_module.py:1.7.10.1 test_class.py:1.6.8.1

[Jeremy Hylton]

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

Modified Files:
      Tag: opaque-pickles-branch
	test_module.py test_class.py 
Log Message:
Update from trunk.


=== Zope3/src/zodb/code/tests/test_module.py 1.7 => 1.7.10.1 ===
--- Zope3/src/zodb/code/tests/test_module.py:1.7	Thu Jan 16 09:45:54 2003
+++ Zope3/src/zodb/code/tests/test_module.py	Wed Mar 12 16:38:40 2003
@@ -19,7 +19,7 @@
 from transaction import get_transaction
 
 import zodb.db
-from zodb.storage.mapping import DB, MappingStorage
+from zodb.storage.mapping import MappingStorage
 from zodb.code import tests # import this package, to get at __file__ reliably
 from zodb.code.module \
      import ManagedRegistry, PersistentModuleImporter, PersistentPackage
@@ -86,7 +86,7 @@
 class TestBase(unittest.TestCase):
 
     def setUp(self):
-        self.db = DB()
+        self.db = zodb.db.DB(MappingStorage())
         self.root = self.db.open().root()
         self.registry = ManagedRegistry()
         self.importer = TestPersistentModuleImporter(self.registry)
@@ -121,6 +121,11 @@
             for obj in mod.__dict__.values():
                 if hasattr(obj, "_p_activate"):
                     obj._p_activate()
+        # XXX somehow objects are getting registered here, but not
+        # modified.  need to figure out what is going wrong, but for
+        # now just abort the transaction.
+        ##assert not cn._registered
+        get_transaction().abort()                    
         cn.close()
 
 class TestModule(TestBase):


=== Zope3/src/zodb/code/tests/test_class.py 1.6 => 1.6.8.1 ===
--- Zope3/src/zodb/code/tests/test_class.py:1.6	Thu Jan 30 13:50:14 2003
+++ Zope3/src/zodb/code/tests/test_class.py	Wed Mar 12 16:38:40 2003
@@ -14,9 +14,6 @@
 import os
 import unittest
 
-import zodb.db
-from zodb.storage.mapping import DB, MappingStorage
-
 from zodb.code.tests.test_module import TestBase
 from zodb.code.module import newModule