test:workers cleanup

Author: cunla

scheduler/redis_models/result.py

@@ -31,14 +31,14 @@ class Result(StreamModel):
 
     @classmethod
     def create(
-            cls,
-            connection: ConnectionType,
-            job_name: str,
-            worker_name: str,
-            _type: ResultType,
-            ttl: int,
-            return_value: Any = None,
-            exc_string: Optional[str] = None,
+        cls,
+        connection: ConnectionType,
+        job_name: str,
+        worker_name: str,
+        _type: ResultType,
+        ttl: int,
+        return_value: Any = None,
+        exc_string: Optional[str] = None,
     ) -> Self:
         result = cls(
             parent=job_name,

scheduler/templatetags/scheduler_tags.py

@@ -5,6 +5,7 @@
 
 from scheduler.helpers.queues import Queue
 from scheduler.models import Task, get_scheduled_task
+from scheduler.models.task import run_task
 from scheduler.redis_models import Result, JobModel
 from scheduler.views.helpers import get_queue
 
@@ -15,7 +16,7 @@
 def show_func_name(job: JobModel) -> str:
     try:
         res = job.func_name
-        if res == "scheduler.helpers.tools.run_task":
+        if job.func == run_task:
             task = get_scheduled_task(*job.args)
             res = task.function_string()
         return mark_safe(res)

scheduler/tests/test_worker/test_worker_creation.py

@@ -53,4 +53,4 @@ def test_create_worker__cleanup(self):
         WorkerModel.cleanup(worker.connection, "default")
         # assert
         all_names = WorkerModel.all_names(worker.connection)
-        self.assertNotIn(worker.name, all_names)
+        self.assertNotIn(worker.name, all_names)