Commit 1aa7de9b authored by Jim Fulton's avatar Jim Fulton

Removed ConflictResolvingMappingStorage. The one test that uses it can

as easily use FileStorage.

Removed commit. It should be gotten from transaction.

Removed some test set-up and tear-down facilities that can now be found
in zope.testing.setupstack.
parent 32fdaac2
...@@ -16,72 +16,9 @@ ...@@ -16,72 +16,9 @@
$Id$ $Id$
""" """
import os
import shutil
import sys
import tempfile
import time import time
import persistent import persistent
import transaction from ZODB.MappingStorage import DB
from ZODB.MappingStorage import MappingStorage
from ZODB.ConflictResolution import ConflictResolvingStorage
from ZODB.DB import DB as _DB
from ZODB import POSException
def DB(name='Test', **dbargs):
return _DB(MappingStorage(name), **dbargs)
class ConflictResolvingMappingStorage(
MappingStorage, ConflictResolvingStorage):
def __init__(self, name='ConflictResolvingMappingStorage'):
MappingStorage.__init__(self, name)
self._old = {}
def loadSerial(self, oid, serial):
self._lock_acquire()
try:
old_info = self._old[oid]
try:
return old_info[serial]
except KeyError:
raise POSException.POSKeyError(oid)
finally:
self._lock_release()
def store(self, oid, serial, data, version, transaction):
if transaction is not self._transaction:
raise POSException.StorageTransactionError(self, transaction)
if version:
raise POSException.Unsupported("Versions aren't supported")
self._lock_acquire()
try:
if oid in self._index:
oserial = self._index[oid][:8]
if serial != oserial:
rdata = self.tryToResolveConflict(
oid, oserial, serial, data)
if rdata is None:
raise POSException.ConflictError(
oid=oid, serials=(oserial, serial), data=data)
else:
data = rdata
self._tindex[oid] = self._tid + data
finally:
self._lock_release()
return self._tid
def _finish(self, tid, user, desc, ext):
self._index.update(self._tindex)
self._ltid = self._tid
for oid, record in self._tindex.items():
self._old.setdefault(oid, {})[self._tid] = record[8:]
def commit():
transaction.commit()
def pack(db): def pack(db):
db.pack(time.time()+1) db.pack(time.time()+1)
...@@ -93,33 +30,3 @@ class P(persistent.Persistent): ...@@ -93,33 +30,3 @@ class P(persistent.Persistent):
def __repr__(self): def __repr__(self):
return 'P(%s)' % self.name return 'P(%s)' % self.name
def setUp(test):
test.globs['__teardown_stack__'] = []
tmp = tempfile.mkdtemp('test')
registerTearDown(test, lambda : rmtree(tmp))
here = os.getcwd()
registerTearDown(test, lambda : os.chdir(here))
os.chdir(tmp)
if sys.platform == 'win32':
# On windows, we can't remove a directory of there are files upen.
# We may need to wait a while for processes to exit.
def rmtree(path):
for i in range(1000):
try:
shutil.rmtree(path)
except OSError:
time.sleep(0.01)
else:
break
else:
rmtree = shutil.rmtree
def registerTearDown(test, func):
test.globs['__teardown_stack__'].append(func)
def tearDown(test):
for f in test.globs['__teardown_stack__']:
f()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment