diff --git a/swh/lister/gitea/tasks.py b/swh/lister/gitea/tasks.py index f6db2ed64a6558a328c532accb0d4266ad47f830..4c70833cdfe65ac03c5a4fabae723ea0154f1227 100644 --- a/swh/lister/gitea/tasks.py +++ b/swh/lister/gitea/tasks.py @@ -1,8 +1,8 @@ -# Copyright (C) 2020 the Software Heritage developers +# Copyright (C) 2020-2022 the Software Heritage developers # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information -from typing import Dict, Optional +from typing import Dict from celery import shared_task @@ -10,16 +10,9 @@ from .lister import GiteaLister @shared_task(name=__name__ + ".FullGiteaRelister") -def list_gitea_full( - url: str, - instance: Optional[str] = None, - api_token: Optional[str] = None, - page_size: Optional[int] = None, -) -> Dict[str, int]: +def list_gitea_full(**lister_args) -> Dict[str, int]: """Full update of a Gitea instance""" - lister = GiteaLister.from_configfile( - url=url, instance=instance, api_token=api_token, page_size=page_size - ) + lister = GiteaLister.from_configfile(**lister_args) return lister.run().dict() diff --git a/swh/lister/gitea/tests/test_tasks.py b/swh/lister/gitea/tests/test_tasks.py index a204cb1deb3f221ef907c35eb6e3bea44e542a41..f418e410dd22db0af7d83f20f33bf6028b327e95 100644 --- a/swh/lister/gitea/tests/test_tasks.py +++ b/swh/lister/gitea/tests/test_tasks.py @@ -30,9 +30,7 @@ def test_full_listing(lister, swh_scheduler_celery_app, swh_scheduler_celery_wor res.wait() assert res.successful() - actual_kwargs = dict(**kwargs, instance=None, api_token=None, page_size=None) - - lister.from_configfile.assert_called_once_with(**actual_kwargs) + lister.from_configfile.assert_called_once_with(**kwargs) lister.run.assert_called_once_with() diff --git a/swh/lister/gogs/tasks.py b/swh/lister/gogs/tasks.py index 81287fa41b335e3eced8e19dfa59244107cccf93..a3ad4386ae9c8fb39fc33a6e882cc29e39aaf785 100644 --- a/swh/lister/gogs/tasks.py +++ b/swh/lister/gogs/tasks.py @@ -2,7 +2,7 @@ # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information -from typing import Dict, Optional +from typing import Dict from celery import shared_task @@ -10,16 +10,9 @@ from .lister import GogsLister @shared_task(name=__name__ + ".FullGogsRelister") -def list_gogs_full( - url: str, - instance: Optional[str] = None, - api_token: Optional[str] = None, - page_size: Optional[int] = None, -) -> Dict[str, int]: +def list_gogs_full(**lister_args) -> Dict[str, int]: """Full update of a Gogs instance""" - lister = GogsLister.from_configfile( - url=url, instance=instance, api_token=api_token, page_size=page_size - ) + lister = GogsLister.from_configfile(**lister_args) return lister.run().dict() diff --git a/swh/lister/gogs/tests/test_tasks.py b/swh/lister/gogs/tests/test_tasks.py index 2f38341b66f696629d51a32d0d609b6628301df7..9698fc3441caa4d13f730a385318163e378594aa 100644 --- a/swh/lister/gogs/tests/test_tasks.py +++ b/swh/lister/gogs/tests/test_tasks.py @@ -30,9 +30,7 @@ def test_full_listing(lister, swh_scheduler_celery_app, swh_scheduler_celery_wor res.wait() assert res.successful() - actual_kwargs = dict(**kwargs, instance=None, api_token=None, page_size=None) - - lister.from_configfile.assert_called_once_with(**actual_kwargs) + lister.from_configfile.assert_called_once_with(**kwargs) lister.run.assert_called_once_with()