Commit 47eb8436 authored by Julien Muchembled's avatar Julien Muchembled

Add some compatibility with ZODB 3.9

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2698 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 07d19338
......@@ -48,7 +48,7 @@ class Storage(BaseStorage.BaseStorage,
_snapshot_tid = None
implements(
implements(*filter(None, (
ZODB.interfaces.IStorage,
# "restore" missing for the moment, but "store" implements this
# interface.
......@@ -59,9 +59,9 @@ class Storage(BaseStorage.BaseStorage,
# ZODB.interfaces.IStorageIteration,
ZODB.interfaces.IStorageUndoable,
ZODB.interfaces.IExternalGC,
ZODB.interfaces.ReadVerifyingStorage,
getattr(ZODB.interfaces, 'ReadVerifyingStorage', None), # XXX ZODB 3.9
ZODB.interfaces.IMVCCStorage,
)
)))
def __init__(self, master_nodes, name, connector=None, read_only=False,
compress=None, logfile=None, verbose=False,
......
......@@ -291,7 +291,12 @@ class TestRunner(BenchmarkRunner):
if config.functional:
runner.run('Functional tests', FUNC_TEST_MODULES)
if config.zodb:
runner.run('ZODB tests', ZODB_TEST_MODULES)
try:
from ZODB.interfaces import ReadVerifyingStorage
except ImportError:
logging.warn(" ZODB tests disabled on ZODB 3.9")
else:
runner.run('ZODB tests', ZODB_TEST_MODULES)
except KeyboardInterrupt:
config['mail_to'] = None
traceback.print_exc()
......
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