diff --git a/swh/loader/package/archive/tasks.py b/swh/loader/package/archive/tasks.py index 76d0563..4313326 100644 --- a/swh/loader/package/archive/tasks.py +++ b/swh/loader/package/archive/tasks.py @@ -1,15 +1,16 @@ # Copyright (C) 2019 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 from celery import shared_task from swh.loader.package.archive.loader import ArchiveLoader @shared_task(name=__name__ + '.LoadArchive') -def load_archive_files(url=None, artifacts=None, identity_artifact_keys=None): +def load_archive_files( + *, url=None, artifacts=None, identity_artifact_keys=None): """Load archive's artifacts (e.g gnu, etc...)""" return ArchiveLoader(url, artifacts, identity_artifact_keys=identity_artifact_keys).load() diff --git a/swh/loader/package/archive/tests/test_tasks.py b/swh/loader/package/archive/tests/test_tasks.py index 798281b..cb56c57 100644 --- a/swh/loader/package/archive/tests/test_tasks.py +++ b/swh/loader/package/archive/tests/test_tasks.py @@ -1,19 +1,22 @@ # Copyright (C) 2019 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 def test_archive_loader(mocker, swh_app, celery_session_worker, swh_config): mock_loader = mocker.patch( 'swh.loader.package.archive.loader.ArchiveLoader.load') mock_loader.return_value = {'status': 'eventful'} res = swh_app.send_task( 'swh.loader.package.archive.tasks.LoadArchive', - (), dict(url='some-url', artifacts=[])) + kwargs={ + 'url': 'some-url', + 'artifacts': [] + }) assert res res.wait() assert res.successful() assert res.result == {'status': 'eventful'} diff --git a/swh/loader/package/debian/tests/test_tasks.py b/swh/loader/package/debian/tests/test_tasks.py index 82a3374..a8b2800 100644 --- a/swh/loader/package/debian/tests/test_tasks.py +++ b/swh/loader/package/debian/tests/test_tasks.py @@ -1,19 +1,23 @@ # Copyright (C) 2019 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 def test_debian_loader(mocker, swh_app, celery_session_worker, swh_config): mock_loader = mocker.patch( 'swh.loader.package.debian.loader.DebianLoader.load') mock_loader.return_value = {'status': 'eventful'} res = swh_app.send_task( 'swh.loader.package.debian.tasks.LoadDebian', - (), dict(url='some-url', date='some-date', packages={})) + kwargs={ + 'url': 'some-url', + 'date': 'some-date', + 'packages': {} + }) assert res res.wait() assert res.successful() assert res.result == {'status': 'eventful'} diff --git a/swh/loader/package/deposit/tests/test_tasks.py b/swh/loader/package/deposit/tests/test_tasks.py index f1fe0aa..9e65609 100644 --- a/swh/loader/package/deposit/tests/test_tasks.py +++ b/swh/loader/package/deposit/tests/test_tasks.py @@ -1,19 +1,22 @@ # Copyright (C) 2019 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 def test_deposit_loader(mocker, swh_app, celery_session_worker, swh_config): mock_loader = mocker.patch( 'swh.loader.package.deposit.loader.DepositLoader.load') mock_loader.return_value = {'status': 'eventful'} res = swh_app.send_task( 'swh.loader.package.deposit.tasks.LoadDeposit', - (), dict(url='some-url', deposit_id='some-d-id')) + kwargs={ + 'url': 'some-url', + 'deposit_id': 'some-d-id', + }) assert res res.wait() assert res.successful() assert res.result == {'status': 'eventful'} diff --git a/swh/loader/package/npm/tests/test_tasks.py b/swh/loader/package/npm/tests/test_tasks.py index f407412..21687ef 100644 --- a/swh/loader/package/npm/tests/test_tasks.py +++ b/swh/loader/package/npm/tests/test_tasks.py @@ -1,18 +1,18 @@ # Copyright (C) 2019 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 def test_npm_loader(mocker, swh_app, celery_session_worker, swh_config): mock_loader = mocker.patch('swh.loader.package.npm.loader.NpmLoader.load') mock_loader.return_value = {'status': 'eventful'} res = swh_app.send_task( 'swh.loader.package.npm.tasks.LoadNpm', - (), dict(url='https://www.npmjs.com/package/some-package')) + kwargs=dict(url='https://www.npmjs.com/package/some-package')) assert res res.wait() assert res.successful() assert res.result == {'status': 'eventful'} diff --git a/swh/loader/package/pypi/tests/test_tasks.py b/swh/loader/package/pypi/tests/test_tasks.py index 2711d57..fcd2aa0 100644 --- a/swh/loader/package/pypi/tests/test_tasks.py +++ b/swh/loader/package/pypi/tests/test_tasks.py @@ -1,19 +1,19 @@ # Copyright (C) 2019 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 def test_pypi_loader(mocker, swh_app, celery_session_worker, swh_config): mock_loader = mocker.patch( 'swh.loader.package.pypi.loader.PyPILoader.load') mock_loader.return_value = {'status': 'eventful'} res = swh_app.send_task( 'swh.loader.package.pypi.tasks.LoadPyPI', - (), dict(url='some-url')) + kwargs=dict(url='some-url')) assert res res.wait() assert res.successful() assert res.result == {'status': 'eventful'}