fix:p3.11

Author: cunla

scheduler/management/commands/scheduler_stats.py

@@ -84,7 +84,7 @@ def _print_stats_dashboard(self, statistics, prev_stats=None, with_color: bool =
     def handle(self, *args, **options):
         if options.get("json") and options.get("yaml"):
             click.secho("Aborting. Cannot output as both json and yaml", err=True, fg="red")
-            return
+            exit(1)
         if options.get("json"):
             import json
 

scheduler/tests/test_mgmt_commands/test_scheduler_stats.py

@@ -85,7 +85,8 @@ def test_scheduler_stats__bad_args(self):
         sys.stderr = StringIO()
         sys.stdout = StringIO()
         # act
-        call_command("scheduler_stats", "-y", "-j")
+        with self.assertRaises(SystemExit):
+            call_command("scheduler_stats", "-y", "-j")
         # assert
         res = sys.stdout.getvalue()
         self.assertEqual(res, """""")

scheduler/views/job_views.py

@@ -20,7 +20,6 @@ class JobDetailAction(str, Enum):
     ENQUEUE = "enqueue"
     CANCEL = "cancel"
 
-
 @never_cache
 @staff_member_required
 def job_detail(request: HttpRequest, job_name: str) -> HttpResponse:
@@ -57,7 +56,7 @@ def job_action(request: HttpRequest, job_name: str, action: str) -> HttpResponse
     if job is None:
         messages.warning(request, f"Job {escape(job_name)} does not exist, maybe its TTL has passed")
         return redirect("queues_home")
-    if action not in JobDetailAction:
+    if action not in [item.value for item in JobDetailAction]:
         return HttpResponseBadRequest(f"Action {escape(action)} is not supported")
 
     if request.method != "POST":

scheduler/views/queue_job_actions.py

@@ -31,7 +31,7 @@ def queue_job_actions(request: HttpRequest, queue_name: str) -> HttpResponse:
     next_url = _check_next_url(request, reverse("queue_registry_jobs", args=[queue_name, "queued"]))
     action = request.POST.get("action", False)
     job_names = request.POST.get("job_names", False)
-    if request.method != "POST" or not action or not job_names or action not in QueueJobAction:
+    if request.method != "POST" or not action or not job_names or action not in [item.value for item in QueueJobAction]:
         return redirect(next_url)
     job_names = request.POST.getlist("job_names")
     if action == QueueJobAction.DELETE.value:

scheduler/views/queue_registry_actions.py

@@ -48,7 +48,7 @@ def queue_registry_actions(request: HttpRequest, queue_name: str, registry_name:
     if registry is None:
         return HttpResponseNotFound()
     next_url = _check_next_url(request, reverse("queue_registry_jobs", args=[queue_name, registry_name]))
-    if action not in QueueRegistryActions:
+    if action not in [item.value for item in QueueRegistryActions]:
         return redirect(next_url)
     if request.method == "POST":
         if action == QueueRegistryActions.EMPTY.value: