Order TestPlan objects when searching them and when testing

this fixes test failures on Postgres which are due to DB returning the records in non-deterministic order.
kiwitcms · Nov 3, 2017 · cb21646 · cb21646
1 parent f592a94
commit cb21646
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tcms/testplans/models.py b/tcms/testplans/models.py
@@ -101,7 +101,7 @@ def list(cls, query=None):
                          Q(name__icontains=new_query['search']))
             del new_query['search']
 
-        return q.filter(**new_query).distinct()
+        return q.filter(**new_query).order_by('pk').distinct()
 
     def confirmed_case(self):
         return self.case.filter(case_status__name='CONFIRMED')

diff --git a/tcms/testplans/tests.py b/tcms/testplans/tests.py
@@ -898,7 +898,7 @@ def test_search_all_runs(self):
         self.assertEqual(0, data['sEcho'])
         self.assertEqual(TestPlan.objects.count(), data['iTotalRecords'])
         self.assertEqual(TestPlan.objects.count(), data['iTotalDisplayRecords'])
-        for i, plan in enumerate(TestPlan.objects.all()):
+        for i, plan in enumerate(TestPlan.objects.all().order_by('pk')):
             self.assertEqual(
                 "<a href='{}'>{}</a>".format(plan.get_absolute_url(), plan.pk),
                 data['aaData'][i]['1'])