diff --git a/requirements-swh.txt b/requirements-swh.txt index a602fab..3530b6e 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,4 +1,4 @@ swh.model >= 0.0.27 swh.storage >= 0.0.114 swh.scheduler >= 0.0.39 -swh.loader.core >= 0.0.43 +swh.loader.core >= 0.0.67 diff --git a/swh/loader/mercurial/tests/common.py b/swh/loader/mercurial/tests/common.py index 107968a..333ce7a 100644 --- a/swh/loader/mercurial/tests/common.py +++ b/swh/loader/mercurial/tests/common.py @@ -1,64 +1,59 @@ -# Copyright (C) 2018 The Software Heritage developers +# Copyright (C) 2018-2019 The Software Heritage developers # See the AUTHORS file at the top-level directory of this distribution # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information from swh.loader.mercurial.loader import ( HgBundle20Loader, HgArchiveBundle20Loader ) _LOADER_TEST_CONFIG = { 'bundle_filename': 'HG20_none_bundle', 'cache1_size': 838860800, 'cache2_size': 838860800, - 'content_packet_size': 100000, - 'content_packet_size_bytes': 1073741824, 'content_size_limit': 104857600, - 'directory_packet_size': 25000, 'clone_timeout_seconds': 2 * 3600, 'log_db': 'dbname=softwareheritage-log', - 'occurrence_packet_size': 100000, 'reduce_effort': False, - 'release_packet_size': 100000, - 'revision_packet_size': 100000, 'save_data': False, 'save_data_path': '', - 'send_contents': True, - 'send_directories': True, - 'send_occurrences': True, - 'send_releases': True, - 'send_revisions': True, - 'send_snapshot': True, - 'storage': {'args': {}, 'cls': 'memory'}, + 'max_content_size': 100 * 1024 * 1024, + 'storage': { + 'cls': 'pipeline', + 'steps': [ + {'cls': 'filter'}, + {'cls': 'memory'}, + ] + }, 'temp_directory': '/tmp/swh.loader.mercurial' } class BaseHgLoaderMemoryStorage: """The base mercurial loader to test. Mixin behavior changed to: - use an in-memory storage - not use the default configuration loading mechanism At the end of the tests, you can make sure you have the rights objects. """ def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.origin_id = 1 self.visit = 1 def parse_config_file(self, *args, **kwargs): return _LOADER_TEST_CONFIG class HgLoaderMemoryStorage(BaseHgLoaderMemoryStorage, HgBundle20Loader): pass class HgArchiveLoaderMemoryStorage(BaseHgLoaderMemoryStorage, HgArchiveBundle20Loader): pass