fix abort

Author: giancarloromeo

services/storage/src/simcore_service_storage/modules/celery/client.py

@@ -16,6 +16,7 @@
 
 from .models import (
     TaskContext,
+    TaskID,
     TaskMetadata,
     TaskMetadataStore,
     TaskState,
@@ -78,16 +79,18 @@ async def send_task(
             await self._task_store.set(task_id, task_metadata, expiry=expiry)
             return task_uuid
 
-    @staticmethod
     @make_async()
-    def abort_task(task_context: TaskContext, task_uuid: TaskUUID) -> None:
+    def _abort_task(self, task_id: TaskID) -> None:
+        AbortableAsyncResult(task_id, app=self._celery_app).abort()
+
+    async def abort_task(self, task_context: TaskContext, task_uuid: TaskUUID) -> None:
         with log_context(
             _logger,
             logging.DEBUG,
             msg=f"Abort task: {task_context=} {task_uuid=}",
         ):
             task_id = build_task_id(task_context, task_uuid)
-            AbortableAsyncResult(task_id).abort()
+            return await self._abort_task(task_id)
 
     async def get_task_result(
         self, task_context: TaskContext, task_uuid: TaskUUID

services/storage/tests/unit/test_async_jobs.py

@@ -241,15 +241,7 @@ async def test_asybc_jobs_workflow(
     "exposed_rpc_start",
     [
         rpc_sync_job.__name__,
-        pytest.param(
-            rpc_async_job.__name__,
-            marks=pytest.mark.skip(
-                reason=(
-                    "hangs after teardown for unknown reason "
-                    "SEE https://github.com/ITISFoundation/osparc-simcore/issues/7486"
-                )
-            ),
-        ),
+        rpc_async_job.__name__,
     ],
 )
 async def test_async_jobs_cancel(