diff --git a/swh/lister/gitea/tasks.py b/swh/lister/gitea/tasks.py --- 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 @@ @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 --- a/swh/lister/gitea/tests/test_tasks.py +++ b/swh/lister/gitea/tests/test_tasks.py @@ -30,9 +30,7 @@ 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 --- 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 @@ @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 --- a/swh/lister/gogs/tests/test_tasks.py +++ b/swh/lister/gogs/tests/test_tasks.py @@ -30,9 +30,7 @@ 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()