diff --git a/requirements-swh.txt b/requirements-swh.txt index bbdb106..dccdb8b 100644 --- a/requirements-swh.txt +++ b/requirements-swh.txt @@ -1,2 +1,2 @@ swh.core >= 0.3 -swh.scheduler >= 0.0.58 +swh.scheduler >= 0.7.0 diff --git a/swh/lister/pytest_plugin.py b/swh/lister/pytest_plugin.py index 29c194b..86760c6 100644 --- a/swh/lister/pytest_plugin.py +++ b/swh/lister/pytest_plugin.py @@ -1,62 +1,62 @@ # Copyright (C) 2019-2020 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 import logging import os import pytest from sqlalchemy import create_engine import yaml from swh.lister import SUPPORTED_LISTERS, get_lister from swh.lister.core.models import initialize logger = logging.getLogger(__name__) @pytest.fixture def lister_db_url(postgresql_proc, postgresql): db_url = "postgresql://{user}@{host}:{port}/{dbname}".format( host=postgresql_proc.host, port=postgresql_proc.port, user="postgres", dbname="tests", ) logger.debug("lister db_url: %s", db_url) return db_url @pytest.fixture def lister_under_test(): """Fixture to determine which lister to test""" return "core" @pytest.fixture def swh_lister_config(lister_db_url, swh_scheduler_config): return { - "scheduler": {"cls": "local", "args": {"db": swh_scheduler_config}["db"]}, + "scheduler": {"cls": "local", **swh_scheduler_config}, "lister": {"cls": "local", "args": {"db": lister_db_url},}, "credentials": {}, "cache_responses": False, } @pytest.fixture(autouse=True) def swh_config(swh_lister_config, monkeypatch, tmp_path): conf_path = os.path.join(str(tmp_path), "lister.yml") with open(conf_path, "w") as f: f.write(yaml.dump(swh_lister_config)) monkeypatch.setenv("SWH_CONFIG_FILENAME", conf_path) return conf_path @pytest.fixture def swh_lister(lister_db_url, swh_scheduler, lister_under_test, swh_config): assert lister_under_test in SUPPORTED_LISTERS lister = get_lister(lister_under_test, db_url=lister_db_url) initialize(create_engine(lister_db_url), drop_tables=True) return lister