diff --git a/src/ZEO/tests/testZEO.py b/src/ZEO/tests/testZEO.py index 978c6c0224944d0c11998ffa1e4581a818ce195e..82b4638831c774f508e79a713c0c6f20c4755a20 100644 --- a/src/ZEO/tests/testZEO.py +++ b/src/ZEO/tests/testZEO.py @@ -379,9 +379,16 @@ class FileStorageTests(FullGenericTests): self.failUnless(ZODB.interfaces.IStorageIteration.providedBy( self._storage)) # This is communicated using ClientStorage's _info object: - self.assertEquals((('ZODB.interfaces', 'IStorageIteration'), - ('zope.interface', 'Interface')), - self._storage._info['interfaces']) + self.assertEquals( + (('ZODB.interfaces', 'IStorageRestoreable'), + ('ZODB.interfaces', 'IStorageIteration'), + ('ZODB.interfaces', 'IStorageUndoable'), + ('ZODB.interfaces', 'IStorageCurrentRecordIteration'), + ('ZODB.interfaces', 'IStorage'), + ('zope.interface', 'Interface'), + ), + self._storage._info['interfaces'] + ) class MappingStorageTests(GenericTests): diff --git a/src/ZODB/FileStorage/FileStorage.py b/src/ZODB/FileStorage/FileStorage.py index 42844cc15d95ed3adac6a36744fbc2614b4e8bd5..5f43061356f1cb674acb98351b275c18a4908073 100644 --- a/src/ZODB/FileStorage/FileStorage.py +++ b/src/ZODB/FileStorage/FileStorage.py @@ -90,7 +90,13 @@ class FileStorage(BaseStorage.BaseStorage, ConflictResolution.ConflictResolvingStorage, FileStorageFormatter): - zope.interface.implements(ZODB.interfaces.IStorageIteration) + zope.interface.implements( + ZODB.interfaces.IStorage, + ZODB.interfaces.IStorageRestoreable, + ZODB.interfaces.IStorageIteration, + ZODB.interfaces.IStorageUndoable, + ZODB.interfaces.IStorageCurrentRecordIteration, + ) # Set True while a pack is in progress; undo is blocked for the duration. _pack_is_in_progress = False @@ -933,8 +939,7 @@ class FileStorage(BaseStorage.BaseStorage, return tindex - def history(self, oid, version=None, size=1, filter=None): - assert not version + def history(self, oid, size=1, filter=None): self._lock_acquire() try: r = []