diff --git a/conftest.py b/conftest.py new file mode 100644 --- /dev/null +++ b/conftest.py @@ -0,0 +1,6 @@ +# Copyright (C) 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 + +pytest_plugins = ["swh.scheduler.pytest_plugin"] diff --git a/pytest.ini b/pytest.ini --- a/pytest.ini +++ b/pytest.ini @@ -1,2 +1,5 @@ [pytest] +# We need this to avoid conflicts between the autoloaded fixture, and the +# manually loaded one. +addopts = -p no:pytest_swh_scheduler norecursedirs = docs diff --git a/requirements-test.txt b/requirements-test.txt --- a/requirements-test.txt +++ b/requirements-test.txt @@ -1,5 +1,6 @@ pytest pytest-postgresql requests_mock -testing.postgresql sqlalchemy-stubs +swh.scheduler[testing] >= 0.5 +testing.postgresql diff --git a/swh/lister/bitbucket/tests/test_tasks.py b/swh/lister/bitbucket/tests/test_tasks.py --- a/swh/lister/bitbucket/tests/test_tasks.py +++ b/swh/lister/bitbucket/tests/test_tasks.py @@ -1,11 +1,16 @@ +# 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 + from time import sleep from celery.result import GroupResult from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.bitbucket.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.bitbucket.tasks.ping") assert res res.wait() assert res.successful() @@ -13,13 +18,15 @@ @patch("swh.lister.bitbucket.tasks.BitBucketLister") -def test_incremental(lister, swh_app, celery_session_worker): +def test_incremental(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked BitbucketLister lister.return_value = lister lister.db_last_index.return_value = 42 lister.run.return_value = None - res = swh_app.send_task("swh.lister.bitbucket.tasks.IncrementalBitBucketLister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.bitbucket.tasks.IncrementalBitBucketLister" + ) assert res res.wait() assert res.successful() @@ -30,12 +37,12 @@ @patch("swh.lister.bitbucket.tasks.BitBucketLister") -def test_range(lister, swh_app, celery_session_worker): +def test_range(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked BitbucketLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task( + res = swh_scheduler_celery_app.send_task( "swh.lister.bitbucket.tasks.RangeBitBucketLister", kwargs=dict(start=12, end=42) ) assert res @@ -48,13 +55,15 @@ @patch("swh.lister.bitbucket.tasks.BitBucketLister") -def test_relister(lister, swh_app, celery_session_worker): +def test_relister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked BitbucketLister lister.return_value = lister lister.run.return_value = None lister.db_partition_indices.return_value = [(i, i + 9) for i in range(0, 50, 10)] - res = swh_app.send_task("swh.lister.bitbucket.tasks.FullBitBucketRelister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.bitbucket.tasks.FullBitBucketRelister" + ) assert res res.wait() @@ -64,7 +73,7 @@ # to complete promise_id = res.result assert promise_id - promise = GroupResult.restore(promise_id, app=swh_app) + promise = GroupResult.restore(promise_id, app=swh_scheduler_celery_app) for i in range(5): if promise.ready(): break diff --git a/swh/lister/cgit/tests/test_tasks.py b/swh/lister/cgit/tests/test_tasks.py --- a/swh/lister/cgit/tests/test_tasks.py +++ b/swh/lister/cgit/tests/test_tasks.py @@ -1,8 +1,13 @@ +# 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 + from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.cgit.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.cgit.tasks.ping") assert res res.wait() assert res.successful() @@ -10,12 +15,12 @@ @patch("swh.lister.cgit.tasks.CGitLister") -def test_lister(lister, swh_app, celery_session_worker): +def test_lister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked CGitLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task( + res = swh_scheduler_celery_app.send_task( "swh.lister.cgit.tasks.CGitListerTask", kwargs=dict(url="https://git.kernel.org/", instance="kernel"), ) diff --git a/swh/lister/core/tests/conftest.py b/swh/lister/core/tests/conftest.py --- a/swh/lister/core/tests/conftest.py +++ b/swh/lister/core/tests/conftest.py @@ -1,10 +1,8 @@ -# Copyright (C) 2019 The Software Heritage developers +# 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 -from swh.scheduler.tests.conftest import * # noqa - import logging import pytest diff --git a/swh/lister/cran/tests/test_tasks.py b/swh/lister/cran/tests/test_tasks.py --- a/swh/lister/cran/tests/test_tasks.py +++ b/swh/lister/cran/tests/test_tasks.py @@ -1,8 +1,13 @@ +# 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 + from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.cran.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.cran.tasks.ping") assert res res.wait() assert res.successful() @@ -10,12 +15,12 @@ @patch("swh.lister.cran.tasks.CRANLister") -def test_lister(lister, swh_app, celery_session_worker): +def test_lister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked CRANLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task("swh.lister.cran.tasks.CRANListerTask") + res = swh_scheduler_celery_app.send_task("swh.lister.cran.tasks.CRANListerTask") assert res res.wait() assert res.successful() diff --git a/swh/lister/debian/tests/test_tasks.py b/swh/lister/debian/tests/test_tasks.py --- a/swh/lister/debian/tests/test_tasks.py +++ b/swh/lister/debian/tests/test_tasks.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019 The Software Heritage developers +# 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 @@ -6,8 +6,8 @@ from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.debian.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.debian.tasks.ping") assert res res.wait() assert res.successful() @@ -15,12 +15,14 @@ @patch("swh.lister.debian.tasks.DebianLister") -def test_lister(lister, swh_app, celery_session_worker): +def test_lister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked DebianLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task("swh.lister.debian.tasks.DebianListerTask", ("stretch",)) + res = swh_scheduler_celery_app.send_task( + "swh.lister.debian.tasks.DebianListerTask", ("stretch",) + ) assert res res.wait() assert res.successful() 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 @@ -1,11 +1,16 @@ +# Copyright (C) 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 + from time import sleep from celery.result import GroupResult from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.gitea.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.gitea.tasks.ping") assert res res.wait() assert res.successful() @@ -13,13 +18,15 @@ @patch("swh.lister.gitea.tasks.GiteaLister") -def test_incremental(lister, swh_app, celery_session_worker): +def test_incremental(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GiteaLister lister.return_value = lister lister.run.return_value = None lister.get_pages_information.return_value = (None, 10, None) - res = swh_app.send_task("swh.lister.gitea.tasks.IncrementalGiteaLister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.gitea.tasks.IncrementalGiteaLister" + ) assert res res.wait() assert res.successful() @@ -31,12 +38,12 @@ @patch("swh.lister.gitea.tasks.GiteaLister") -def test_range(lister, swh_app, celery_session_worker): +def test_range(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GiteaLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task( + res = swh_scheduler_celery_app.send_task( "swh.lister.gitea.tasks.RangeGiteaLister", kwargs=dict(start=12, end=42) ) assert res @@ -49,7 +56,7 @@ @patch("swh.lister.gitea.tasks.GiteaLister") -def test_relister(lister, swh_app, celery_session_worker): +def test_relister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GiteaLister lister.return_value = lister lister.run.return_value = None @@ -58,7 +65,7 @@ (i, i + 9) for i in range(0, 80, 10) ] + [(80, 85)] - res = swh_app.send_task("swh.lister.gitea.tasks.FullGiteaRelister") + res = swh_scheduler_celery_app.send_task("swh.lister.gitea.tasks.FullGiteaRelister") assert res res.wait() @@ -68,7 +75,7 @@ # to complete promise_id = res.result assert promise_id - promise = GroupResult.restore(promise_id, app=swh_app) + promise = GroupResult.restore(promise_id, app=swh_scheduler_celery_app) for i in range(5): if promise.ready(): break @@ -94,7 +101,9 @@ @patch("swh.lister.gitea.tasks.GiteaLister") -def test_relister_instance(lister, swh_app, celery_session_worker): +def test_relister_instance( + lister, swh_scheduler_celery_app, swh_scheduler_celery_worker +): # setup the mocked GiteaLister lister.return_value = lister lister.run.return_value = None @@ -103,7 +112,7 @@ (i, i + 9) for i in range(0, 80, 10) ] + [(80, 85)] - res = swh_app.send_task( + res = swh_scheduler_celery_app.send_task( "swh.lister.gitea.tasks.FullGiteaRelister", kwargs=dict(url="https://0xacab.org/api/v4"), ) @@ -116,7 +125,7 @@ # to complete promise_id = res.result assert promise_id - promise = GroupResult.restore(promise_id, app=swh_app) + promise = GroupResult.restore(promise_id, app=swh_scheduler_celery_app) for i in range(5): if promise.ready(): break diff --git a/swh/lister/github/tests/test_tasks.py b/swh/lister/github/tests/test_tasks.py --- a/swh/lister/github/tests/test_tasks.py +++ b/swh/lister/github/tests/test_tasks.py @@ -4,8 +4,8 @@ from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.github.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.github.tasks.ping") assert res res.wait() assert res.successful() @@ -13,13 +13,15 @@ @patch("swh.lister.github.tasks.GitHubLister") -def test_incremental(lister, swh_app, celery_session_worker): +def test_incremental(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GitHubLister lister.return_value = lister lister.db_last_index.return_value = 42 lister.run.return_value = None - res = swh_app.send_task("swh.lister.github.tasks.IncrementalGitHubLister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.github.tasks.IncrementalGitHubLister" + ) assert res res.wait() assert res.successful() @@ -30,12 +32,12 @@ @patch("swh.lister.github.tasks.GitHubLister") -def test_range(lister, swh_app, celery_session_worker): +def test_range(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GitHubLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task( + res = swh_scheduler_celery_app.send_task( "swh.lister.github.tasks.RangeGitHubLister", kwargs=dict(start=12, end=42) ) assert res @@ -48,13 +50,15 @@ @patch("swh.lister.github.tasks.GitHubLister") -def test_relister(lister, swh_app, celery_session_worker): +def test_relister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GitHubLister lister.return_value = lister lister.run.return_value = None lister.db_partition_indices.return_value = [(i, i + 9) for i in range(0, 50, 10)] - res = swh_app.send_task("swh.lister.github.tasks.FullGitHubRelister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.github.tasks.FullGitHubRelister" + ) assert res res.wait() @@ -64,7 +68,7 @@ # to complete promise_id = res.result assert promise_id - promise = GroupResult.restore(promise_id, app=swh_app) + promise = GroupResult.restore(promise_id, app=swh_scheduler_celery_app) for i in range(5): if promise.ready(): break diff --git a/swh/lister/gitlab/tests/test_tasks.py b/swh/lister/gitlab/tests/test_tasks.py --- a/swh/lister/gitlab/tests/test_tasks.py +++ b/swh/lister/gitlab/tests/test_tasks.py @@ -1,11 +1,16 @@ +# 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 + from time import sleep from celery.result import GroupResult from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.gitlab.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.gitlab.tasks.ping") assert res res.wait() assert res.successful() @@ -13,13 +18,15 @@ @patch("swh.lister.gitlab.tasks.GitLabLister") -def test_incremental(lister, swh_app, celery_session_worker): +def test_incremental(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GitlabLister lister.return_value = lister lister.run.return_value = None lister.get_pages_information.return_value = (None, 10, None) - res = swh_app.send_task("swh.lister.gitlab.tasks.IncrementalGitLabLister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.gitlab.tasks.IncrementalGitLabLister" + ) assert res res.wait() assert res.successful() @@ -31,12 +38,12 @@ @patch("swh.lister.gitlab.tasks.GitLabLister") -def test_range(lister, swh_app, celery_session_worker): +def test_range(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GitlabLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task( + res = swh_scheduler_celery_app.send_task( "swh.lister.gitlab.tasks.RangeGitLabLister", kwargs=dict(start=12, end=42) ) assert res @@ -49,7 +56,7 @@ @patch("swh.lister.gitlab.tasks.GitLabLister") -def test_relister(lister, swh_app, celery_session_worker): +def test_relister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GitlabLister lister.return_value = lister lister.run.return_value = None @@ -58,7 +65,9 @@ (i, i + 9) for i in range(0, 80, 10) ] + [(80, 85)] - res = swh_app.send_task("swh.lister.gitlab.tasks.FullGitLabRelister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.gitlab.tasks.FullGitLabRelister" + ) assert res res.wait() @@ -68,7 +77,7 @@ # to complete promise_id = res.result assert promise_id - promise = GroupResult.restore(promise_id, app=swh_app) + promise = GroupResult.restore(promise_id, app=swh_scheduler_celery_app) for i in range(5): if promise.ready(): break @@ -94,7 +103,9 @@ @patch("swh.lister.gitlab.tasks.GitLabLister") -def test_relister_instance(lister, swh_app, celery_session_worker): +def test_relister_instance( + lister, swh_scheduler_celery_app, swh_scheduler_celery_worker +): # setup the mocked GitlabLister lister.return_value = lister lister.run.return_value = None @@ -103,7 +114,7 @@ (i, i + 9) for i in range(0, 80, 10) ] + [(80, 85)] - res = swh_app.send_task( + res = swh_scheduler_celery_app.send_task( "swh.lister.gitlab.tasks.FullGitLabRelister", kwargs=dict(url="https://0xacab.org/api/v4"), ) @@ -116,7 +127,7 @@ # to complete promise_id = res.result assert promise_id - promise = GroupResult.restore(promise_id, app=swh_app) + promise = GroupResult.restore(promise_id, app=swh_scheduler_celery_app) for i in range(5): if promise.ready(): break diff --git a/swh/lister/gnu/tests/test_tasks.py b/swh/lister/gnu/tests/test_tasks.py --- a/swh/lister/gnu/tests/test_tasks.py +++ b/swh/lister/gnu/tests/test_tasks.py @@ -1,8 +1,13 @@ +# 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 + from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.gnu.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.gnu.tasks.ping") assert res res.wait() assert res.successful() @@ -10,12 +15,12 @@ @patch("swh.lister.gnu.tasks.GNULister") -def test_lister(lister, swh_app, celery_session_worker): +def test_lister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked GNULister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task("swh.lister.gnu.tasks.GNUListerTask") + res = swh_scheduler_celery_app.send_task("swh.lister.gnu.tasks.GNUListerTask") assert res res.wait() assert res.successful() diff --git a/swh/lister/launchpad/tests/test_tasks.py b/swh/lister/launchpad/tests/test_tasks.py --- a/swh/lister/launchpad/tests/test_tasks.py +++ b/swh/lister/launchpad/tests/test_tasks.py @@ -1,13 +1,20 @@ +# Copyright (C) 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 + from unittest.mock import patch @patch("swh.lister.launchpad.tasks.LaunchpadLister") -def test_new(lister, swh_app, celery_session_worker): +def test_new(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked LaunchpadLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task("swh.lister.launchpad.tasks.NewLaunchpadLister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.launchpad.tasks.NewLaunchpadLister" + ) assert res res.wait() assert res.successful() @@ -18,12 +25,14 @@ @patch("swh.lister.launchpad.tasks.LaunchpadLister") -def test_full(lister, swh_app, celery_session_worker): +def test_full(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked LaunchpadLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task("swh.lister.launchpad.tasks.FullLaunchpadLister") + res = swh_scheduler_celery_app.send_task( + "swh.lister.launchpad.tasks.FullLaunchpadLister" + ) assert res res.wait() assert res.successful() diff --git a/swh/lister/npm/tests/test_tasks.py b/swh/lister/npm/tests/test_tasks.py --- a/swh/lister/npm/tests/test_tasks.py +++ b/swh/lister/npm/tests/test_tasks.py @@ -1,3 +1,8 @@ +# 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 + from contextlib import contextmanager from unittest.mock import patch @@ -7,8 +12,8 @@ yield -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.npm.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.npm.tasks.ping") assert res res.wait() assert res.successful() @@ -17,13 +22,13 @@ @patch("swh.lister.npm.tasks.save_registry_state") @patch("swh.lister.npm.tasks.NpmLister") -def test_lister(lister, save, swh_app, celery_session_worker): +def test_lister(lister, save, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked NpmLister lister.return_value = lister lister.run.return_value = None save.side_effect = mock_save - res = swh_app.send_task("swh.lister.npm.tasks.NpmListerTask") + res = swh_scheduler_celery_app.send_task("swh.lister.npm.tasks.NpmListerTask") assert res res.wait() assert res.successful() @@ -35,14 +40,18 @@ @patch("swh.lister.npm.tasks.save_registry_state") @patch("swh.lister.npm.tasks.get_last_update_seq") @patch("swh.lister.npm.tasks.NpmIncrementalLister") -def test_incremental(lister, seq, save, swh_app, celery_session_worker): +def test_incremental( + lister, seq, save, swh_scheduler_celery_app, swh_scheduler_celery_worker +): # setup the mocked NpmLister lister.return_value = lister lister.run.return_value = None seq.return_value = 42 save.side_effect = mock_save - res = swh_app.send_task("swh.lister.npm.tasks.NpmIncrementalListerTask") + res = swh_scheduler_celery_app.send_task( + "swh.lister.npm.tasks.NpmIncrementalListerTask" + ) assert res res.wait() assert res.successful() diff --git a/swh/lister/packagist/tests/test_tasks.py b/swh/lister/packagist/tests/test_tasks.py --- a/swh/lister/packagist/tests/test_tasks.py +++ b/swh/lister/packagist/tests/test_tasks.py @@ -1,12 +1,12 @@ -# Copyright (C) 2019 the Software Heritage developers +# Copyright (C) 2019-2020 the Software Heritage developers # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.packagist.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.packagist.tasks.ping") assert res res.wait() assert res.successful() @@ -14,12 +14,14 @@ @patch("swh.lister.packagist.tasks.PackagistLister") -def test_lister(lister, swh_app, celery_session_worker): +def test_lister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked PackagistLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task("swh.lister.packagist.tasks.PackagistListerTask") + res = swh_scheduler_celery_app.send_task( + "swh.lister.packagist.tasks.PackagistListerTask" + ) assert res res.wait() assert res.successful() diff --git a/swh/lister/phabricator/tests/test_tasks.py b/swh/lister/phabricator/tests/test_tasks.py --- a/swh/lister/phabricator/tests/test_tasks.py +++ b/swh/lister/phabricator/tests/test_tasks.py @@ -1,10 +1,10 @@ -# Copyright (C) 2019 the Software Heritage developers +# Copyright (C) 2019-2020 the Software Heritage developers # License: GNU General Public License version 3, or any later version # See top-level LICENSE file for more information -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.phabricator.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.phabricator.tasks.ping") assert res res.wait() assert res.successful() diff --git a/swh/lister/pypi/tests/test_tasks.py b/swh/lister/pypi/tests/test_tasks.py --- a/swh/lister/pypi/tests/test_tasks.py +++ b/swh/lister/pypi/tests/test_tasks.py @@ -1,8 +1,13 @@ +# 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 + from unittest.mock import patch -def test_ping(swh_app, celery_session_worker): - res = swh_app.send_task("swh.lister.pypi.tasks.ping") +def test_ping(swh_scheduler_celery_app, swh_scheduler_celery_worker): + res = swh_scheduler_celery_app.send_task("swh.lister.pypi.tasks.ping") assert res res.wait() assert res.successful() @@ -10,12 +15,12 @@ @patch("swh.lister.pypi.tasks.PyPILister") -def test_lister(lister, swh_app, celery_session_worker): +def test_lister(lister, swh_scheduler_celery_app, swh_scheduler_celery_worker): # setup the mocked PypiLister lister.return_value = lister lister.run.return_value = None - res = swh_app.send_task("swh.lister.pypi.tasks.PyPIListerTask") + res = swh_scheduler_celery_app.send_task("swh.lister.pypi.tasks.PyPIListerTask") assert res res.wait() assert res.successful() diff --git a/swh/lister/tests/test_cli.py b/swh/lister/tests/test_cli.py --- a/swh/lister/tests/test_cli.py +++ b/swh/lister/tests/test_cli.py @@ -1,4 +1,4 @@ -# Copyright (C) 2019 The Software Heritage developers +# 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 diff --git a/tox.ini b/tox.ini --- a/tox.ini +++ b/tox.ini @@ -6,6 +6,7 @@ testing deps = swh.core[http] >= 0.0.61 + swh.scheduler[testing] >= 0.5.0 pytest-cov dev: ipdb commands =