NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-29 11:56:25 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

7848 fix tests

Browse Source
This commit is contained in:
Arthur Hanson 2024-11-18 16:36:05 -08:00
parent ea6e456849
commit 8ffec29403
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netbox/core/api/urls.py
View File

@ -17,12 +17,6 @@ router.register('background-workers', views.WorkerViewSet, basename='rqworker')
router.register('background-tasks/(?P<queue_name>.+)/', views.TaskViewSet, basename='rqtask') router.register('background-tasks/(?P<queue_name>.+)/', views.TaskViewSet, basename='rqtask')
urlpatterns = ( 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>/', 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>/delete/', views.TaskDeleteView.as_view(), name="background_task_delete"),
path('background-task/<str:task_id>/requeue/', views.TaskRequeueView.as_view(), name="background_task_requeue"), path('background-task/<str:task_id>/requeue/', views.TaskRequeueView.as_view(), name="background_task_requeue"),

10
netbox/core/api/views.py
View File

@ -299,11 +299,11 @@ class TaskViewSet(viewsets.ViewSet):
except KeyError: except KeyError:
raise Http404 raise Http404
if not status: if status:
data = get_rq_jobs_from_status(queue, status)
else:
data = queue.get_jobs() data = queue.get_jobs()
data = get_rq_jobs_from_status(queue, status)
paginator = LimitOffsetListPagination() paginator = LimitOffsetListPagination()
data = paginator.paginate_list(data, request) data = paginator.paginate_list(data, request)
@ -318,6 +318,10 @@ class TaskViewSet(viewsets.ViewSet):
def deferred(self, request, queue_name): def deferred(self, request, queue_name):
return self.get_response(request, queue_name, "deferred") 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) @action(methods=["GET"], detail=False)
def finished(self, request, queue_name): def finished(self, request, queue_name):
return self.get_response(request, queue_name, "finished") return self.get_response(request, queue_name, "finished")

4
netbox/core/tests/test_api.py
View File

@ -273,7 +273,7 @@ class BackgroundTaskTestCase(TestCase):
worker2 = get_worker('high') worker2 = get_worker('high')
worker2.register_birth() 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.assertEqual(response.status_code, 200)
self.assertIn(str(worker1.name), str(response.content)) self.assertIn(str(worker1.name), str(response.content))
@ -281,7 +281,7 @@ class BackgroundTaskTestCase(TestCase):
worker1 = get_worker('default', name=uuid.uuid4().hex) worker1 = get_worker('default', name=uuid.uuid4().hex)
worker1.register_birth() 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.assertEqual(response.status_code, 200)
self.assertIn(str(worker1.name), str(response.content)) self.assertIn(str(worker1.name), str(response.content))
self.assertIn('birth_date', str(response.content)) self.assertIn('birth_date', str(response.content))