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

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