Commit 291a61ef authored by Jim Fulton's avatar Jim Fulton

Removed unneeded loadEx and added missing close and cleanup methods.

parent 4f785719
...@@ -74,19 +74,16 @@ class MinimalMemoryStorage(BaseStorage, object): ...@@ -74,19 +74,16 @@ class MinimalMemoryStorage(BaseStorage, object):
def _clear_temp(self): def _clear_temp(self):
pass pass
def loadEx(self, oid, version): def load(self, oid, version):
self._lock_acquire() self._lock_acquire()
try: try:
assert not version assert not version
tid = self._cur[oid] tid = self._cur[oid]
self.hook(oid, tid, version) self.hook(oid, tid, '')
return self._index[(oid, tid)], tid, "" return self._index[(oid, tid)], tid
finally: finally:
self._lock_release() self._lock_release()
def load(self, oid, version):
return self.loadEx(oid, version)[:2]
def _begin(self, tid, u, d, e): def _begin(self, tid, u, d, e):
self._txn = Transaction(tid) self._txn = Transaction(tid)
...@@ -145,6 +142,11 @@ class MinimalMemoryStorage(BaseStorage, object): ...@@ -145,6 +142,11 @@ class MinimalMemoryStorage(BaseStorage, object):
finally: finally:
self._lock_release() self._lock_release()
def close(self):
pass
cleanup = close
class MinimalTestSuite(StorageTestBase.StorageTestBase, class MinimalTestSuite(StorageTestBase.StorageTestBase,
BasicStorage.BasicStorage, BasicStorage.BasicStorage,
MTStorage.MTStorage, MTStorage.MTStorage,
......
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