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

Fix tests

Browse Source
This commit is contained in:
Jeremy Stretch 2025-04-11 13:53:52 -04:00
parent 155932ea8e
commit 30e2456199
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
netbox/extras/tests/test_filtersets.py
View File

@ -1275,9 +1275,9 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
} }
tags = ( tags = (
Tag(name='Tag 1', slug='tag-1', color='ff0000', description='foobar1'), Tag(name='Tag 1', slug='tag-1', color='ff0000', weight=1000, description='foobar1'),
Tag(name='Tag 2', slug='tag-2', color='00ff00', description='foobar2'), Tag(name='Tag 2', slug='tag-2', color='00ff00', weight=2000, description='foobar2'),
Tag(name='Tag 3', slug='tag-3', color='0000ff', weight=1000), Tag(name='Tag 3', slug='tag-3', color='0000ff', weight=3000),
) )
Tag.objects.bulk_create(tags) Tag.objects.bulk_create(tags)
tags[0].object_types.add(object_types['site']) tags[0].object_types.add(object_types['site'])
@ -1331,11 +1331,8 @@ class TagTestCase(TestCase, ChangeLoggedFilterSetTests):
) )
def test_weight(self): def test_weight(self):
params = {'weight': [1000]} params = {'weight': [1000, 2000]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 1) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 2)
params = {'weight': [0]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 3)
class TaggedItemFilterSetTestCase(TestCase): class TaggedItemFilterSetTestCase(TestCase):

16
netbox/extras/tests/test_models.py
View File

@ -12,10 +12,10 @@ from virtualization.models import Cluster, ClusterGroup, ClusterType, VirtualMac
class TagTest(TestCase): class TagTest(TestCase):
def test_default_ordering_weight_then_name_is_set(self): def test_default_ordering_weight_then_name_is_set(self):
Tag.objects.create(name='Tag 1', slug='tag-1', weight=100) Tag.objects.create(name='Tag 1', slug='tag-1', weight=3000)
Tag.objects.create(name='Tag 2', slug='tag-2') Tag.objects.create(name='Tag 2', slug='tag-2') # Default: 1000
Tag.objects.create(name='Tag 3', slug='tag-3', weight=10) Tag.objects.create(name='Tag 3', slug='tag-3', weight=2000)
Tag.objects.create(name='Tag 4', slug='tag-4', weight=10) Tag.objects.create(name='Tag 4', slug='tag-4', weight=2000)
tags = Tag.objects.all() tags = Tag.objects.all()
@ -26,10 +26,10 @@ class TagTest(TestCase):
def test_tag_related_manager_ordering_weight_then_name(self): def test_tag_related_manager_ordering_weight_then_name(self):
tags = [ tags = [
Tag.objects.create(name='Tag 1', slug='tag-1', weight=100), Tag.objects.create(name='Tag 1', slug='tag-1', weight=3000),
Tag.objects.create(name='Tag 2', slug='tag-2'), Tag.objects.create(name='Tag 2', slug='tag-2'), # Default: 1000
Tag.objects.create(name='Tag 3', slug='tag-3', weight=10), Tag.objects.create(name='Tag 3', slug='tag-3', weight=2000),
Tag.objects.create(name='Tag 4', slug='tag-4', weight=10), Tag.objects.create(name='Tag 4', slug='tag-4', weight=2000),
] ]
site = Site.objects.create(name='Site 1') site = Site.objects.create(name='Site 1')