fix tests

osl-incubator · Jun 20, 2024 · a00d023 · a00d023
1 parent ddd90f9
commit a00d023
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 26 deletions.
diff --git a/tests/test_task_celery_parallel.py b/tests/test_task_celery_parallel.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Generator, Optional
+from typing import Generator
 
 import celery
 import pytest
@@ -16,32 +16,26 @@
 class MyResultTask(ParallelCeleryTask):
     """Task for the test."""
 
-    def get_chord_tasks(  # type: ignore
+    def get_group_tasks(  # type: ignore
         self, *args, **kwargs
-    ) -> tuple[list[celery.Signature], Optional[celery.Signature]]:
+    ) -> list[celery.Signature]:
         """Define the list of tasks for celery chord."""
         x = kwargs.get("x")
         y = kwargs.get("y")
         task_id = kwargs.get("task_id")
-        return (
-            [task_sum.s(x, y, task_id)],
-            None,
-        )
+        return [task_sum.s(x, y, task_id)]
 
 
 class MyTimestampTask(ParallelCeleryTask):
     """Task for the test."""
 
-    def get_chord_tasks(  # type: ignore
+    def get_group_tasks(  # type: ignore
         self, *args, **kwargs
-    ) -> tuple[list[celery.Signature], Optional[celery.Signature]]:
+    ) -> list[celery.Signature]:
         """Define the list of tasks for celery chord."""
         seconds = kwargs.get("seconds")
         task_id = kwargs.get("task_id")
-        return (
-            [task_sleep.s(seconds, task_id)],
-            None,
-        )
+        return [task_sleep.s(seconds, task_id)]
 
 
 @pytest.fixture

diff --git a/tests/test_task_celery_serial.py b/tests/test_task_celery_serial.py
@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Generator, Optional
+from typing import Generator
 
 import celery
 import pytest
@@ -16,32 +16,26 @@
 class MyResultTask(SerialCeleryTask):
     """Task for the test."""
 
-    def get_chord_tasks(  # type: ignore
+    def get_group_tasks(  # type: ignore
         self, *args, **kwargs
-    ) -> tuple[list[celery.Signature], Optional[celery.Signature]]:
+    ) -> list[celery.Signature]:
         """Define the list of tasks for celery chord."""
         x = kwargs.get("x")
         y = kwargs.get("y")
         task_id = kwargs.get("task_id")
-        return (
-            [task_sum.s(x, y, task_id)],
-            None,
-        )
+        return [task_sum.s(x, y, task_id)]
 
 
 class MyTimestampTask(SerialCeleryTask):
     """Task for the test."""
 
-    def get_chord_tasks(  # type: ignore
+    def get_group_tasks(  # type: ignore
         self, *args, **kwargs
-    ) -> tuple[list[celery.Signature], Optional[celery.Signature]]:
+    ) -> list[celery.Signature]:
         """Define the list of tasks for celery chord."""
         seconds = kwargs.get("seconds")
         task_id = kwargs.get("task_id")
-        return (
-            [task_sleep.s(seconds, task_id)],
-            None,
-        )
+        return [task_sleep.s(seconds, task_id)]
 
 
 @pytest.fixture