diff --git a/swh/lister/bitbucket/tasks.py b/swh/lister/bitbucket/tasks.py index 841d6cc..8d222b8 100644 --- a/swh/lister/bitbucket/tasks.py +++ b/swh/lister/bitbucket/tasks.py @@ -45,9 +45,11 @@ def full_bitbucket_relister(self, split=None, **lister_args): lister = new_lister(**lister_args) ranges = lister.db_partition_indices(split or GROUP_SPLIT) random.shuffle(ranges) - group(range_bitbucket_lister.s(minv, maxv, **lister_args) - for minv, maxv in ranges)() + promise = group(range_bitbucket_lister.s(minv, maxv, **lister_args) + for minv, maxv in ranges)() self.log.debug('%s OK (spawned %s subtasks)' % (self.name, len(ranges))) + promise.save() # so that we can restore the GroupResult in tests + return promise.id @app.task(name='swh.lister.bitbucket.tasks.ping', diff --git a/swh/lister/bitbucket/tests/conftest.py b/swh/lister/bitbucket/tests/conftest.py new file mode 100644 index 0000000..507fef9 --- /dev/null +++ b/swh/lister/bitbucket/tests/conftest.py @@ -0,0 +1 @@ +from swh.lister.core.tests.conftest import * # noqa diff --git a/swh/lister/bitbucket/tests/test_tasks.py b/swh/lister/bitbucket/tests/test_tasks.py new file mode 100644 index 0000000..7674627 --- /dev/null +++ b/swh/lister/bitbucket/tests/test_tasks.py @@ -0,0 +1,89 @@ +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') + assert res + res.wait() + assert res.successful() + assert res.result == 'OK' + + +@patch('swh.lister.bitbucket.tasks.BitBucketLister') +def test_incremental(lister, swh_app, celery_session_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') + assert res + res.wait() + assert res.successful() + + lister.assert_called_once_with(api_baseurl='https://api.bitbucket.org/2.0') + lister.db_last_index.assert_called_once_with() + lister.run.assert_called_once_with(min_bound=42, max_bound=None) + + +@patch('swh.lister.bitbucket.tasks.BitBucketLister') +def test_range(lister, swh_app, celery_session_worker): + # setup the mocked BitbucketLister + lister.return_value = lister + lister.run.return_value = None + + res = swh_app.send_task( + 'swh.lister.bitbucket.tasks.RangeBitBucketLister', + kwargs=dict(start=12, end=42)) + assert res + res.wait() + assert res.successful() + + lister.assert_called_once_with(api_baseurl='https://api.bitbucket.org/2.0') + lister.db_last_index.assert_not_called() + lister.run.assert_called_once_with(min_bound=12, max_bound=42) + + +@patch('swh.lister.bitbucket.tasks.BitBucketLister') +def test_relister(lister, swh_app, celery_session_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') + assert res + + res.wait() + assert res.successful() + + # retrieve the GroupResult for this task and wait for all the subtasks + # to complete + promise_id = res.result + assert promise_id + promise = GroupResult.restore(promise_id, app=swh_app) + for i in range(5): + if promise.ready(): + break + sleep(1) + + lister.assert_called_with(api_baseurl='https://api.bitbucket.org/2.0') + + # one by the FullBitbucketRelister task + # + 5 for the RangeBitbucketLister subtasks + assert lister.call_count == 6 + + lister.db_last_index.assert_not_called() + lister.db_partition_indices.assert_called_once_with(10000) + + # lister.run should have been called once per partition interval + for i in range(5): + assert (dict(min_bound=10*i, max_bound=10*i + 9),) \ + in lister.run.call_args_list diff --git a/swh/lister/core/tests/conftest.py b/swh/lister/core/tests/conftest.py index ab172eb..07ef181 100644 --- a/swh/lister/core/tests/conftest.py +++ b/swh/lister/core/tests/conftest.py @@ -9,6 +9,7 @@ def celery_enable_logging(): @pytest.fixture(scope='session') def celery_includes(): return [ + 'swh.lister.bitbucket.tasks', 'swh.lister.github.tasks', ]