From 8ffec294033d9c47a0605097b15f65b3df16e15d Mon Sep 17 00:00:00 2001
From: Arthur Hanson <worldnomad@gmail.com>
Date: Mon, 18 Nov 2024 16:36:05 -0800
Subject: [PATCH] 7848 fix tests

---
 netbox/core/api/urls.py       |  6 ------
 netbox/core/api/views.py      | 10 +++++++---
 netbox/core/tests/test_api.py |  4 ++--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/netbox/core/api/urls.py b/netbox/core/api/urls.py
index 936b885b1..3a0d376fe 100644
--- a/netbox/core/api/urls.py
+++ b/netbox/core/api/urls.py
@@ -17,12 +17,6 @@ router.register('background-workers', views.WorkerViewSet, basename='rqworker')
 router.register('background-tasks/(?P<queue_name>.+)/', views.TaskViewSet, basename='rqtask')
 
 urlpatterns = (
-    # path('background-tasks/<str:queue_name>/', views.TaskListView.as_view(), name="background_task_list"),
-    # path('background-tasks/<str:queue_name>/deferred/', views.DeferredTaskListView.as_view(), name="background_tasks_deferred"),
-    # path('background-tasks/<str:queue_name>/failed/', views.FailedTaskListView.as_view(), name="background_tasks_failed"),
-    # path('background-tasks/<str:queue_name>/finished/', views.FinishedTaskListView.as_view(), name="background_tasks_finished"),
-    # path('background-tasks/<str:queue_name>/started/', views.StartedTaskListView.as_view(), name="background_tasks_started"),
-    # path('background-tasks/<str:queue_name>/queued/', views.QueuedTaskListView.as_view(), name="background_tasks_queued"),
     path('background-task/<str:task_id>/', views.TaskDetailView.as_view(), name="background_task_detail"),
     path('background-task/<str:task_id>/delete/', views.TaskDeleteView.as_view(), name="background_task_delete"),
     path('background-task/<str:task_id>/requeue/', views.TaskRequeueView.as_view(), name="background_task_requeue"),
diff --git a/netbox/core/api/views.py b/netbox/core/api/views.py
index 8f234ce9b..bf603e0a1 100644
--- a/netbox/core/api/views.py
+++ b/netbox/core/api/views.py
@@ -299,11 +299,11 @@ class TaskViewSet(viewsets.ViewSet):
         except KeyError:
             raise Http404
 
-        if not status:
+        if status:
+            data = get_rq_jobs_from_status(queue, status)
+        else:
             data = queue.get_jobs()
 
-        data = get_rq_jobs_from_status(queue, status)
-
         paginator = LimitOffsetListPagination()
         data = paginator.paginate_list(data, request)
 
@@ -318,6 +318,10 @@ class TaskViewSet(viewsets.ViewSet):
     def deferred(self, request, queue_name):
         return self.get_response(request, queue_name, "deferred")
 
+    @action(methods=["GET"], detail=False)
+    def failed(self, request, queue_name):
+        return self.get_response(request, queue_name, "failed")
+
     @action(methods=["GET"], detail=False)
     def finished(self, request, queue_name):
         return self.get_response(request, queue_name, "finished")
diff --git a/netbox/core/tests/test_api.py b/netbox/core/tests/test_api.py
index 7e046725e..ce0282888 100644
--- a/netbox/core/tests/test_api.py
+++ b/netbox/core/tests/test_api.py
@@ -273,7 +273,7 @@ class BackgroundTaskTestCase(TestCase):
         worker2 = get_worker('high')
         worker2.register_birth()
 
-        response = self.client.get(reverse('core-api:background_worker_list'), **self.header)
+        response = self.client.get(reverse('core-api:rqworker-list'), **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertIn(str(worker1.name), str(response.content))
 
@@ -281,7 +281,7 @@ class BackgroundTaskTestCase(TestCase):
         worker1 = get_worker('default', name=uuid.uuid4().hex)
         worker1.register_birth()
 
-        response = self.client.get(reverse('core-api:background_worker_detail', args=[worker1.name]), **self.header)
+        response = self.client.get(reverse('core-api:rqworker-detail', args=[worker1.name]), **self.header)
         self.assertEqual(response.status_code, 200)
         self.assertIn(str(worker1.name), str(response.content))
         self.assertIn('birth_date', str(response.content))