reonokiy/swh-lister
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use the new names for the swh.scheduler test fixtures

Browse source
This commit is contained in:
Nicolas Dandrimont 2020-07-09 12:14:42 +02:00
parent 014c446d05
commit c9963d4302
19 changed files with 170 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

6
conftest.py Normal file
View file

@ -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"]

3
pytest.ini
View file

@ -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

3
requirements-test.txt
View file

@ -1,5 +1,6 @@
pytest
pytest-postgresql
requests_mock
testing.postgresql
sqlalchemy-stubs
swh.scheduler[testing] >= 0.5
testing.postgresql

27
swh/lister/bitbucket/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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 @@ def test_incremental(lister, swh_app, celery_session_worker):
@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 @@ def test_range(lister, swh_app, celery_session_worker):
@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 @@ def test_relister(lister, swh_app, celery_session_worker):
# 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

13
swh/lister/cgit/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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"),
)

4
swh/lister/core/tests/conftest.py
View file

@ -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

13
swh/lister/cran/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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()

12
swh/lister/debian/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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()

33
swh/lister/gitea/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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 @@ def test_incremental(lister, swh_app, celery_session_worker):
@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 @@ def test_range(lister, swh_app, celery_session_worker):
@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 @@ def test_relister(lister, swh_app, celery_session_worker):
(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 @@ def test_relister(lister, swh_app, celery_session_worker):
# 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 @@ def test_relister(lister, swh_app, celery_session_worker):
@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 @@ def test_relister_instance(lister, swh_app, celery_session_worker):
(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 @@ def test_relister_instance(lister, swh_app, celery_session_worker):
# 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

22
swh/lister/github/tests/test_tasks.py
View file

@ -4,8 +4,8 @@ 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.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 @@ def test_ping(swh_app, celery_session_worker):
@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 @@ def test_incremental(lister, swh_app, celery_session_worker):
@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 @@ def test_range(lister, swh_app, celery_session_worker):
@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 @@ def test_relister(lister, swh_app, celery_session_worker):
# 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

35
swh/lister/gitlab/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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 @@ def test_incremental(lister, swh_app, celery_session_worker):
@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 @@ def test_range(lister, swh_app, celery_session_worker):
@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 @@ def test_relister(lister, swh_app, celery_session_worker):
(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 @@ def test_relister(lister, swh_app, celery_session_worker):
# 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 @@ def test_relister(lister, swh_app, celery_session_worker):
@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 @@ def test_relister_instance(lister, swh_app, celery_session_worker):
(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 @@ def test_relister_instance(lister, swh_app, celery_session_worker):
# 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

13
swh/lister/gnu/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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()

17
swh/lister/launchpad/tests/test_tasks.py
View file

@ -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 @@ def test_new(lister, swh_app, celery_session_worker):
@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()

21
swh/lister/npm/tests/test_tasks.py
View file

@ -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 @@ def mock_save(lister):
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 @@ def test_ping(swh_app, celery_session_worker):
@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 @@ def test_lister(lister, save, swh_app, celery_session_worker):
@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()

12
swh/lister/packagist/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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()

6
swh/lister/phabricator/tests/test_tasks.py
View file

@ -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()

13
swh/lister/pypi/tests/test_tasks.py
View file

@ -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 @@ def test_ping(swh_app, celery_session_worker):
@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()

2
swh/lister/tests/test_cli.py
View file

@ -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

1
tox.ini
View file

@ -6,6 +6,7 @@ extras =
testing
deps =
swh.core[http] >= 0.0.61
swh.scheduler[testing] >= 0.5.0
pytest-cov
dev: ipdb
commands =