NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

18417 fix tests

Browse Source
This commit is contained in:
Arthur 2025-03-18 08:44:54 -07:00
parent 604ef7b8e4
commit 1dc249c13f
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/dcim/filtersets.py
View File

@ -312,8 +312,9 @@ class RackTypeFilterSet(NetBoxModelFilterSet):
class Meta:
model = RackType
fields = (
'id', 'model', 'slug', 'u_height', 'starting_unit', 'desc_units', 'outer_width', 'outer_depth',
'outer_unit', 'mounting_depth', 'weight', 'max_weight', 'weight_unit', 'description',
'id', 'model', 'slug', 'u_height', 'starting_unit', 'desc_units',
'outer_width', 'outer_height', 'outer_depth', 'outer_unit', 'mounting_depth',
'weight', 'max_weight', 'weight_unit', 'description',
)
def search(self, queryset, name, value):
@ -425,8 +426,8 @@ class RackFilterSet(NetBoxModelFilterSet, TenancyFilterSet, ContactModelFilterSe
model = Rack
fields = (
'id', 'name', 'facility_id', 'asset_tag', 'u_height', 'starting_unit', 'desc_units', 'outer_width',
'outer_depth', 'outer_unit', 'mounting_depth', 'airflow', 'weight', 'max_weight', 'weight_unit',
'description',
'outer_height', 'outer_depth', 'outer_unit', 'mounting_depth', 'airflow',
'weight', 'max_weight', 'weight_unit', 'description',
)
def search(self, queryset, name, value):

16
netbox/dcim/tests/test_filtersets.py
View File

@ -551,6 +551,7 @@ class RackTypeTestCase(TestCase, ChangeLoggedFilterSetTests):
starting_unit=1,
desc_units=False,
outer_width=100,
outer_height=100,
outer_depth=100,
outer_unit=RackDimensionUnitChoices.UNIT_MILLIMETER,
mounting_depth=100,
@ -569,6 +570,7 @@ class RackTypeTestCase(TestCase, ChangeLoggedFilterSetTests):
starting_unit=2,
desc_units=False,
outer_width=200,
outer_height=200,
outer_depth=200,
outer_unit=RackDimensionUnitChoices.UNIT_MILLIMETER,
mounting_depth=200,
@ -587,6 +589,7 @@ class RackTypeTestCase(TestCase, ChangeLoggedFilterSetTests):
starting_unit=3,
desc_units=True,
outer_width=300,
outer_height=300,
outer_depth=300,
outer_unit=RackDimensionUnitChoices.UNIT_INCH,
mounting_depth=300,
@ -647,6 +650,10 @@ class RackTypeTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'outer_width': [100, 200]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_outer_height(self):
params = {'outer_height': [100, 200]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_outer_depth(self):
params = {'outer_depth': [100, 200]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
@ -730,6 +737,7 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests):
starting_unit=1,
desc_units=False,
outer_width=100,
outer_height=100,
outer_depth=100,
outer_unit=RackDimensionUnitChoices.UNIT_MILLIMETER,
mounting_depth=100,
@ -748,6 +756,7 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests):
starting_unit=2,
desc_units=False,
outer_width=200,
outer_height=200,
outer_depth=200,
outer_unit=RackDimensionUnitChoices.UNIT_MILLIMETER,
mounting_depth=200,
@ -797,6 +806,7 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests):
u_height=42,
desc_units=False,
outer_width=100,
outer_height=100,
outer_depth=100,
outer_unit=RackDimensionUnitChoices.UNIT_MILLIMETER,
weight=10,
@ -820,6 +830,7 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests):
u_height=43,
desc_units=False,
outer_width=200,
outer_height=200,
outer_depth=200,
outer_unit=RackDimensionUnitChoices.UNIT_MILLIMETER,
weight=20,
@ -843,6 +854,7 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests):
u_height=44,
desc_units=True,
outer_width=300,
outer_height=300,
outer_depth=300,
outer_unit=RackDimensionUnitChoices.UNIT_INCH,
weight=30,
@ -923,6 +935,10 @@ class RackTestCase(TestCase, ChangeLoggedFilterSetTests):
params = {'outer_width': [100, 200]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_outer_height(self):
params = {'outer_height': [100, 200]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
def test_outer_depth(self):
params = {'outer_depth': [100, 200]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)