[Zope-Checkins] CVS: Zope3/lib/python/ZODB/tests - BasicStorage.py:1.14.6.1 ConflictResolution.py:1.6.30.1 PackableStorage.py:1.12.6.1 StorageTestBase.py:1.9.6.1 Synchronization.py:1.2.36.1 testZODB.py:1.1.86.1 testDemoStorage.py:NONE

[Jim Fulton]

Update of /cvs-repository/Zope3/lib/python/ZODB/tests
In directory cvs.zope.org:/tmp/cvs-serv18399/tests

Modified Files:
      Tag: Zope-3x-branch
	BasicStorage.py ConflictResolution.py PackableStorage.py 
	StorageTestBase.py Synchronization.py testZODB.py 
Removed Files:
      Tag: Zope-3x-branch
	testDemoStorage.py 
Log Message:
Refactored persistence and transactions out of ZODB.

Changed to use threading locks. 

Removed temporarily:

  - C optimizations

  - DemoStorage, because it depends on not-yet-ported BTrees.


=== Zope3/lib/python/ZODB/tests/BasicStorage.py 1.14 => 1.14.6.1 ===
 """
 
-from ZODB.Transaction import Transaction
+from Transaction import Transaction
 from ZODB import POSException
 
 from ZODB.tests.MinPO import MinPO


=== Zope3/lib/python/ZODB/tests/ConflictResolution.py 1.6 => 1.6.30.1 ===
 
-from ZODB.Transaction import Transaction
+from Transaction import Transaction
 from ZODB.POSException import ConflictError, UndoError
 from Persistence import Persistent
 


=== Zope3/lib/python/ZODB/tests/PackableStorage.py 1.12 => 1.12.6.1 ===
             self._storage.load(ZERO, '')
         except KeyError:
-            import PersistentMapping
-            from ZODB.Transaction import Transaction
+            from Persistence import PersistentMapping
+            from Transaction import Transaction
             file = StringIO()
             p = cPickle.Pickler(file, 1)
-            p.dump((PersistentMapping.PersistentMapping, None))
+            p.dump((PersistentMapping, None))
             p.dump({'_container': {}})
             t=Transaction()
             t.description='initial database creation'


=== Zope3/lib/python/ZODB/tests/StorageTestBase.py 1.9 => 1.9.6.1 ===
 from cStringIO import StringIO
 
-from ZODB.Transaction import Transaction
+from Transaction import Transaction
 
 from ZODB.tests.MinPO import MinPO
 


=== Zope3/lib/python/ZODB/tests/Synchronization.py 1.2 => 1.2.36.1 ===
 """
 
-from ZODB.Transaction import Transaction
+from Transaction import Transaction
 from ZODB.POSException import StorageTransactionError
 
 VERSION = "testversion"


=== Zope3/lib/python/ZODB/tests/testZODB.py 1.1 => 1.1.86.1 ===
 import ZODB
 import ZODB.FileStorage
-from ZODB.PersistentMapping import PersistentMapping
+from Persistence import PersistentMapping
 import unittest
 
 class ExportImportTests:

=== Removed File Zope3/lib/python/ZODB/tests/testDemoStorage.py ===