Skip to content

Commit 9fba5a8

Browse files
committed
Fix tests
Signed-off-by: Tushar Goel <tushar.goel.dav@gmail.com>
1 parent 8d6f17b commit 9fba5a8

1 file changed

Lines changed: 24 additions & 2 deletions

File tree

vulnerabilities/tests/pipelines/v2_improvers/test_compute_advisory_todo_v2.py

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#
99

1010
import json
11+
from collections.abc import Mapping
1112
from datetime import datetime
1213

1314
from django.test import TestCase
@@ -381,7 +382,10 @@ def test_todo_conflict_details_partial_curation(self):
381382
result_partial_curation = issue_details["partial_curation_advisory"]
382383
self.assertEqual(1, AdvisoryToDoV2.objects.count())
383384
self.assertEqual("CONFLICTING_FIXED_BY_PACKAGES", todo.issue_type)
384-
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)
385+
self.assertEqual(
386+
normalize(expected_partial_curation_advisory),
387+
normalize(result_partial_curation),
388+
)
385389

386390
def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_affected_and_fixed(
387391
self,
@@ -513,7 +517,10 @@ def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_fi
513517
result_partial_curation = issue_details["partial_curation_advisory"]
514518
self.assertEqual(1, AdvisoryToDoV2.objects.count())
515519
self.assertEqual("CONFLICTING_FIXED_BY_PACKAGES", todo.issue_type)
516-
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)
520+
self.assertEqual(
521+
normalize(expected_partial_curation_advisory),
522+
normalize(result_partial_curation),
523+
)
517524

518525
def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_affected(self):
519526
expected_partial_curation_advisory = {
@@ -586,3 +593,18 @@ def test_todo_conflict_details_partial_curation_unpaired_purl_and_conflicting_af
586593
self.assertEqual(1, AdvisoryToDoV2.objects.count())
587594
self.assertEqual("CONFLICTING_AFFECTED_PACKAGES", todo.issue_type)
588595
self.assertDictEqual(expected_partial_curation_advisory, result_partial_curation)
596+
597+
598+
def normalize(obj):
599+
if isinstance(obj, Mapping):
600+
return {k: normalize(v) for k, v in sorted(obj.items())}
601+
602+
if isinstance(obj, list):
603+
normalized = [normalize(item) for item in obj]
604+
605+
return sorted(
606+
normalized,
607+
key=lambda x: repr(x),
608+
)
609+
610+
return obj

0 commit comments

Comments
 (0)