diff --git a/osf_tests/test_archiver.py b/osf_tests/test_archiver.py index 078ad11ac64..4dc9b1a23e0 100644 --- a/osf_tests/test_archiver.py +++ b/osf_tests/test_archiver.py @@ -617,7 +617,6 @@ def test_archive_addon_does_not_trigger_callback_immediately(self, mock_archive_ mock_archive_callback.assert_not_called() - @mock.patch('website.archiver.tasks.handlers.enqueue_task') @mock.patch('website.archiver.tasks.archive_callback.si') @mock.patch('website.archiver.tasks.make_copy_request.s') @mock.patch('website.archiver.tasks.celery.chain') @@ -630,7 +629,6 @@ def test_archive_node_only_enqueues_addon_work_before_callback( mock_chain, mock_make_copy_request_s, mock_archive_callback, - mock_enqueue_task, ): settings.MAX_ARCHIVE_SIZE = 1024 ** 3 with mock.patch.object(BaseStorageAddon, '_get_file_tree') as mock_file_tree: @@ -653,7 +651,6 @@ def test_archive_node_only_enqueues_addon_work_before_callback( mock_group.return_value, mock_archive_callback.return_value, ]) - mock_enqueue_task.assert_called_once_with(mock_chain.return_value) @pytest.mark.usefixtures('mock_gravy_valet_get_verified_links') def test_archive_success(self): diff --git a/website/archiver/tasks.py b/website/archiver/tasks.py index 84c9d91ea44..d390b67dc7e 100644 --- a/website/archiver/tasks.py +++ b/website/archiver/tasks.py @@ -7,7 +7,7 @@ import celery from celery.utils.log import get_task_logger -from framework.celery_tasks import app as celery_app, handlers +from framework.celery_tasks import app as celery_app from framework.celery_tasks.utils import logged from framework.exceptions import HTTPError from framework import sentry @@ -395,16 +395,15 @@ def archive_node(self, stat_results, job_pk): ) if not addon_tasks: - handlers.enqueue_task(archive_callback.si(dst_id=dst._id)) - return - - handlers.enqueue_task( - celery.chain( - [ - celery.group(addon_tasks), - archive_callback.si(dst_id=dst._id), - ] - ) + return celery.chain([ + archive_callback.si(dst_id=dst._id) + ]) + + return celery.chain( + [ + celery.group(addon_tasks), + archive_callback.si(dst_id=dst._id), + ] )