diff --git a/swh/lister/cgit/tasks.py b/swh/lister/cgit/tasks.py index 31148dd..723d44d 100644 --- a/swh/lister/cgit/tasks.py +++ b/swh/lister/cgit/tasks.py @@ -1,25 +1,17 @@ # Copyright (C) 2019 the Software Heritage developers # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information from swh.scheduler.celery_backend.config import app from .lister import CGitLister -def new_lister(url='https://git.kernel.org/', - url_prefix=None, - instance='kernal', **kw): - return CGitLister(url=url, instance=instance, url_prefix=url_prefix, - **kw) - - @app.task(name=__name__ + '.CGitListerTask') def cgit_lister(**lister_args): - lister = new_lister(**lister_args) - lister.run() + CGitLister(**lister_args).run() @app.task(name=__name__ + '.ping') def ping(): return 'OK' diff --git a/swh/lister/cgit/tests/test_tasks.py b/swh/lister/cgit/tests/test_tasks.py index 4a36a05..38bf7b7 100644 --- a/swh/lister/cgit/tests/test_tasks.py +++ b/swh/lister/cgit/tests/test_tasks.py @@ -1,53 +1,30 @@ from unittest.mock import patch def test_ping(swh_app, celery_session_worker): res = swh_app.send_task( 'swh.lister.cgit.tasks.ping') assert res res.wait() assert res.successful() assert res.result == 'OK' @patch('swh.lister.cgit.tasks.CGitLister') -def test_lister_no_url_prefix(lister, swh_app, celery_session_worker): +def test_lister(lister, swh_app, celery_session_worker): # setup the mocked CGitLister lister.return_value = lister lister.run.return_value = None res = swh_app.send_task( 'swh.lister.cgit.tasks.CGitListerTask', kwargs=dict(url='https://git.kernel.org/', instance='kernel')) assert res res.wait() assert res.successful() lister.assert_called_once_with( url='https://git.kernel.org/', - url_prefix=None, instance='kernel') lister.db_last_index.assert_not_called() lister.run.assert_called_once_with() - - -@patch('swh.lister.cgit.tasks.CGitLister') -def test_lister_with_url_prefix(lister, swh_app, celery_session_worker): - # setup the mocked CGitLister - lister.return_value = lister - lister.run.return_value = None - - res = swh_app.send_task( - 'swh.lister.cgit.tasks.CGitListerTask', - kwargs=dict(url='https://cgit.kde.org/', - url_prefix='https://anongit.kde.org/', instance='kde')) - assert res - res.wait() - assert res.successful() - - lister.assert_called_once_with( - url='https://cgit.kde.org/', - url_prefix='https://anongit.kde.org/', - instance='kde') - lister.db_last_index.assert_not_called() - lister.run.assert_called_once_with()