RomanNum3ral
/
netbox
mirror of https://github.com/netbox-community/netbox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test(ipam): Make AnnotatedIPAddressTable checkbox test deterministic 

Replace whole-table HTML string counting in AnnotatedIPAddressTableTest
`test_ipaddress_has_checkbox_iprange_does_not` with row-specific `pk`
cell assertions.

This avoids false failures when an `IPAddress` and `IPRange` happen to
share the same numeric primary key and makes the test stable in CI.

Fixes #21971
This commit is contained in:
Martin Hauser 2026-04-20 19:55:55 +02:00 committed by Jeremy Stretch
parent c62d0e8579
commit 4260280452
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
netbox/ipam/tests/test_tables.py
View File

@ -1,4 +1,4 @@
from django.test import RequestFactory, TestCase from django.test import TestCase
from netaddr import IPNetwork from netaddr import IPNetwork
from ipam.models import FHRPGroupAssignment, IPAddress, IPRange, Prefix from ipam.models import FHRPGroupAssignment, IPAddress, IPRange, Prefix
@ -24,7 +24,8 @@ class AnnotatedIPAddressTableTest(TestCase):
cls.ip_range = IPRange.objects.create( cls.ip_range = IPRange.objects.create(
start_address=IPNetwork('10.1.1.2/24'), start_address=IPNetwork('10.1.1.2/24'),
end_address=IPNetwork('10.1.1.10/24'), end_address=IPNetwork('10.1.1.10/24'),
status='active' status='active',
mark_populated=True,
) )
def test_ipaddress_has_checkbox_iprange_does_not(self): def test_ipaddress_has_checkbox_iprange_does_not(self):
@ -32,14 +33,18 @@ class AnnotatedIPAddressTableTest(TestCase):
table = AnnotatedIPAddressTable(data, orderable=False) table = AnnotatedIPAddressTable(data, orderable=False)
table.columns.show('pk') table.columns.show('pk')
request = RequestFactory().get('/') ipaddress_row = next(
html = table.as_html(request) row for row in table.rows
if isinstance(row.record, IPAddress) and row.record.pk == self.ip_address.pk
)
iprange_row = next(
row for row in table.rows
if isinstance(row.record, IPRange) and row.record.pk == self.ip_range.pk
)
ipaddress_checkbox_count = html.count(f'name="pk" value="{self.ip_address.pk}"') self.assertIn('name="pk"', ipaddress_row.get_cell('pk'))
self.assertEqual(ipaddress_checkbox_count, 1) self.assertIn(f'value="{self.ip_address.pk}"', ipaddress_row.get_cell('pk'))
self.assertNotIn('name="pk"', iprange_row.get_cell('pk'))
iprange_checkbox_count = html.count(f'name="pk" value="{self.ip_range.pk}"')
self.assertEqual(iprange_checkbox_count, 0)
def test_annotate_ip_space_ipv4_non_pool_excludes_network_and_broadcast(self): def test_annotate_ip_space_ipv4_non_pool_excludes_network_and_broadcast(self):
prefix = Prefix.objects.create( prefix = Prefix.objects.create(