From 36bc51cec58f8a94966e600a9876116415409cd9 Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Thu, 29 Oct 2020 17:54:01 +0100 Subject: [PATCH] lister.gnu.tests: Clarify lister configuration --- swh/lister/gnu/tests/conftest.py | 26 ++++++++++++++++++++++++++ swh/lister/gnu/tests/test_lister.py | 14 +++----------- 2 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 swh/lister/gnu/tests/conftest.py diff --git a/swh/lister/gnu/tests/conftest.py b/swh/lister/gnu/tests/conftest.py new file mode 100644 index 0000000..23cd215 --- /dev/null +++ b/swh/lister/gnu/tests/conftest.py @@ -0,0 +1,26 @@ +# 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 pytest + + +@pytest.fixture +def lister_under_test(): + return "gnu" + + +@pytest.fixture +def lister_gnu(swh_lister): + for task_type in [ + { + "type": "load-archive-files", + "description": "Load archive repository", + "backend_name": "swh.loader.packages.tasks.LoadArchive", + "default_interval": "1 day", + }, + ]: + swh_lister.scheduler.create_task_type(task_type) + + return swh_lister diff --git a/swh/lister/gnu/tests/test_lister.py b/swh/lister/gnu/tests/test_lister.py index 8dedfa9..e17365a 100644 --- a/swh/lister/gnu/tests/test_lister.py +++ b/swh/lister/gnu/tests/test_lister.py @@ -5,21 +5,13 @@ import logging -import pytest - logger = logging.getLogger(__name__) -@pytest.fixture -def lister_under_test(): - return "gnu" +def test_gnu_lister(lister_gnu, requests_mock_datadir): + lister_gnu.run() - -@pytest.fixture -def test_gnu_lister(swh_lister, requests_mock_datadir): - swh_lister.run() - - r = swh_lister.scheduler.search_tasks(task_type="load-archive-files") + r = lister_gnu.scheduler.search_tasks(task_type="load-archive-files") assert len(r) == 383 for row in r: