From def0eb5060795bb86f7d445056c1b5a454bd6b6f Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont (@ardumont)" Date: Thu, 29 Oct 2020 17:39:38 +0100 Subject: [PATCH] lister.gitea.tests: Clarify lister configuration --- swh/lister/gitea/tests/conftest.py | 26 ++++++++++++++++++++++++++ swh/lister/gitea/tests/test_lister.py | 15 +++------------ 2 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 swh/lister/gitea/tests/conftest.py diff --git a/swh/lister/gitea/tests/conftest.py b/swh/lister/gitea/tests/conftest.py new file mode 100644 index 0000000..04db16d --- /dev/null +++ b/swh/lister/gitea/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 "gitea" + + +@pytest.fixture +def lister_gitea(swh_lister): + for task_type in [ + { + "type": "load-git", + "description": "Load git repository", + "backend_name": "swh.loader.git.tasks.UpdateGitRepository", + "default_interval": "1 day", + }, + ]: + swh_lister.scheduler.create_task_type(task_type) + + return swh_lister diff --git a/swh/lister/gitea/tests/test_lister.py b/swh/lister/gitea/tests/test_lister.py index 74161d2..46a9d13 100644 --- a/swh/lister/gitea/tests/test_lister.py +++ b/swh/lister/gitea/tests/test_lister.py @@ -7,8 +7,6 @@ import logging import re import unittest -import pytest - from swh.lister.core.tests.test_lister import HttpListerTesterBase from swh.lister.gitea.lister import GiteaLister @@ -40,16 +38,9 @@ class GiteaListerTester(HttpListerTesterBase, unittest.TestCase): return headers -@pytest.fixture -def lister_under_test(): - return "gitea" - - -def test_lister_gitea(swh_lister, requests_mock_datadir): - lister: GiteaLister = swh_lister - - lister.run() - r = lister.scheduler.search_tasks(task_type="load-git") +def test_lister_gitea(lister_gitea, requests_mock_datadir): + lister_gitea.run() + r = lister_gitea.scheduler.search_tasks(task_type="load-git") assert len(r) == 3 for row in r: