From 5d8be19b87fb34dbc6aed74c8ce0968bbc41d429 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 4 Sep 2025 10:58:41 -0400 Subject: [PATCH] Adapt testing utilities to disregard "update" changelog records immediately following object creation --- netbox/utilities/testing/api.py | 8 ++++---- netbox/utilities/testing/views.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py index 8df8f4438..1fe881367 100644 --- a/netbox/utilities/testing/api.py +++ b/netbox/utilities/testing/api.py @@ -247,9 +247,9 @@ class APIViewTestCases: if issubclass(self.model, ChangeLoggingMixin): objectchange = ObjectChange.objects.get( changed_object_type=ContentType.objects.get_for_model(instance), - changed_object_id=instance.pk + changed_object_id=instance.pk, + action=ObjectChangeActionChoices.ACTION_CREATE, ) - self.assertEqual(objectchange.action, ObjectChangeActionChoices.ACTION_CREATE) self.assertEqual(objectchange.message, data['changelog_message']) def test_bulk_create_objects(self): @@ -298,11 +298,11 @@ class APIViewTestCases: ] objectchanges = ObjectChange.objects.filter( changed_object_type=ContentType.objects.get_for_model(self.model), - changed_object_id__in=id_list + changed_object_id__in=id_list, + action=ObjectChangeActionChoices.ACTION_CREATE, ) self.assertEqual(len(objectchanges), len(self.create_data)) for oc in objectchanges: - self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_CREATE) self.assertEqual(oc.message, changelog_message) class UpdateObjectViewTestCase(APITestCase): diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py index da8a87098..99a6dd43a 100644 --- a/netbox/utilities/testing/views.py +++ b/netbox/utilities/testing/views.py @@ -655,11 +655,11 @@ class ViewTestCases: self.assertIsNotNone(request_id, "Unable to determine request ID from response") objectchanges = ObjectChange.objects.filter( changed_object_type=ContentType.objects.get_for_model(self.model), - request_id=request_id + request_id=request_id, + action=ObjectChangeActionChoices.ACTION_CREATE, ) self.assertEqual(len(objectchanges), len(self.csv_data) - 1) for oc in objectchanges: - self.assertEqual(oc.action, ObjectChangeActionChoices.ACTION_CREATE) self.assertEqual(oc.message, data['changelog_message']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])