From 682ecf5b0e8afce2e740463dd8950492b1fb7098 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 25 Jul 2023 09:24:50 -0400 Subject: [PATCH] Fix tests --- netbox/dcim/models/device_components.py | 2 +- netbox/utilities/tests/test_counters.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/netbox/dcim/models/device_components.py b/netbox/dcim/models/device_components.py index fb80dee56..62f26776f 100644 --- a/netbox/dcim/models/device_components.py +++ b/netbox/dcim/models/device_components.py @@ -991,7 +991,7 @@ class RearPort(ModularComponentModel, CabledObjectModel, TrackingModelMixin): # Bays # -class ModuleBay(ComponentModel): +class ModuleBay(ComponentModel, TrackingModelMixin): """ An empty space within a Device which can house a child device """ diff --git a/netbox/utilities/tests/test_counters.py b/netbox/utilities/tests/test_counters.py index cde2d8a75..e9561c91b 100644 --- a/netbox/utilities/tests/test_counters.py +++ b/netbox/utilities/tests/test_counters.py @@ -26,38 +26,38 @@ class CountersTest(TestCase): When a tracked object (Interface) is added the tracking counter should be updated. """ device1, device2 = Device.objects.all() - self.assertEqual(device1._interface_count, 2) - self.assertEqual(device2._interface_count, 2) + self.assertEqual(device1.interface_count, 2) + self.assertEqual(device2.interface_count, 2) Interface.objects.create(device=device1, name='Interface 5') Interface.objects.create(device=device2, name='Interface 6') device1.refresh_from_db() device2.refresh_from_db() - self.assertEqual(device1._interface_count, 3) - self.assertEqual(device2._interface_count, 3) + self.assertEqual(device1.interface_count, 3) + self.assertEqual(device2.interface_count, 3) def test_interface_count_deletion(self): """ When a tracked object (Interface) is deleted the tracking counter should be updated. """ device1, device2 = Device.objects.all() - self.assertEqual(device1._interface_count, 2) - self.assertEqual(device2._interface_count, 2) + self.assertEqual(device1.interface_count, 2) + self.assertEqual(device2.interface_count, 2) Interface.objects.get(name='Interface 1').delete() Interface.objects.get(name='Interface 3').delete() device1.refresh_from_db() device2.refresh_from_db() - self.assertEqual(device1._interface_count, 1) - self.assertEqual(device2._interface_count, 1) + self.assertEqual(device1.interface_count, 1) + self.assertEqual(device2.interface_count, 1) def test_interface_count_move(self): """ When a tracked object (Interface) is moved the tracking counter should be updated. """ device1, device2 = Device.objects.all() - self.assertEqual(device1._interface_count, 2) - self.assertEqual(device2._interface_count, 2) + self.assertEqual(device1.interface_count, 2) + self.assertEqual(device2.interface_count, 2) interface1 = Interface.objects.get(name='Interface 1') interface1.device = device2 @@ -65,5 +65,5 @@ class CountersTest(TestCase): device1.refresh_from_db() device2.refresh_from_db() - self.assertEqual(device1._interface_count, 1) - self.assertEqual(device2._interface_count, 3) + self.assertEqual(device1.interface_count, 1) + self.assertEqual(device2.interface_count, 3)