From 1b0f0d1aa977a9ca365f1ae8d5284876efa70d89 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 28 May 2020 10:20:37 +0200
Subject: [PATCH] TMSS-177: fixed ordering of subtasks, and reenabled test
---
SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py | 2 +-
SAS/TMSS/test/t_tmssapp_scheduling_REST_API.py | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py b/SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py
index 47804f9c0b7..747bca0f9bf 100644
--- a/SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py
+++ b/SAS/TMSS/src/tmss/tmssapp/viewsets/scheduling.py
@@ -162,7 +162,7 @@ class SubTaskFilter(filters.FilterSet):
class SubtaskViewSet(LOFARViewSet):
queryset = models.Subtask.objects.all()
serializer_class = serializers.SubtaskSerializer
- filter_backends = (OrderingFilter,)
+ filter_backends = (filters.DjangoFilterBackend, OrderingFilter,)
filter_class = SubTaskFilter
ordering = ('start_time',)
diff --git a/SAS/TMSS/test/t_tmssapp_scheduling_REST_API.py b/SAS/TMSS/test/t_tmssapp_scheduling_REST_API.py
index 869a931e973..611b2ea8abc 100755
--- a/SAS/TMSS/test/t_tmssapp_scheduling_REST_API.py
+++ b/SAS/TMSS/test/t_tmssapp_scheduling_REST_API.py
@@ -1542,7 +1542,6 @@ class DataproductArchiveInfoTestCase(unittest.TestCase):
GET_OK_and_assert_equal_expected_response(self, BASE_URL + '/dataproduct_archive_info/%s/' % id2, test_data_2)
-@unittest.skip("TODO: Fix subtaskfilter!")
class SubtaskQueryTestCase(unittest.TestCase):
"""
Test queries on the subtask REST api:
--
GitLab