Use the new names for the swh.scheduler test fixtures
This commit is contained in:
parent
014c446d05
commit
c9963d4302
19 changed files with 170 additions and 86 deletions
|
@ -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()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue