NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 08:46:10 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

7961 update tests remove redundant code

Browse Source
This commit is contained in:
Arthur 2022-10-27 08:45:12 -07:00
parent 969c6dbae8
commit 0be3747c01
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
netbox/ipam/tests/test_views.py
View File

@ -921,7 +921,6 @@ class L2VPNTerminationTestCase(
device = create_test_device('Device 1') device = create_test_device('Device 1')
interface = Interface.objects.create(name='Interface 1', device=device, type='1000baset') interface = Interface.objects.create(name='Interface 1', device=device, type='1000baset')
l2vpn = L2VPN.objects.create(name='L2VPN 1', slug='l2vpn-1', type=L2VPNTypeChoices.TYPE_VXLAN, identifier=650001) l2vpn = L2VPN.objects.create(name='L2VPN 1', slug='l2vpn-1', type=L2VPNTypeChoices.TYPE_VXLAN, identifier=650001)
l2vpn2 = L2VPN.objects.create(name='L2VPN 2', slug='l2vpn-2', type=L2VPNTypeChoices.TYPE_VXLAN, identifier=650002)
vlans = ( vlans = (
VLAN(name='Vlan 1', vid=1001), VLAN(name='Vlan 1', vid=1001),

6
netbox/netbox/views/generic/bulk_views.py
View File

@ -331,7 +331,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
def _update_objects(self, form, request, headers, records): def _update_objects(self, form, request, headers, records):
from utilities.forms import CSVModelChoiceField from utilities.forms import CSVModelChoiceField
new_objs = [] updated_objs = []
ids = [int(record["id"]) for record in records] ids = [int(record["id"]) for record in records]
qs = self.queryset.model.objects.filter(id__in=ids) qs = self.queryset.model.objects.filter(id__in=ids)
@ -356,13 +356,13 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
if obj_form.is_valid(): if obj_form.is_valid():
obj = self._save_obj(obj_form, request) obj = self._save_obj(obj_form, request)
new_objs.append(obj) updated_objs.append(obj)
else: else:
for field, err in obj_form.errors.items(): for field, err in obj_form.errors.items():
form.add_error('csv', f'Row {row} {field}: {err[0]}') form.add_error('csv', f'Row {row} {field}: {err[0]}')
raise ValidationError("") raise ValidationError("")
return new_objs return updated_objs
def _create_objects(self, form, request, headers, records): def _create_objects(self, form, request, headers, records):
new_objs = [] new_objs = []

5
netbox/utilities/testing/views.py
View File

@ -592,9 +592,10 @@ class ViewTestCases:
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
def test_bulk_update_objects_with_permission(self): def test_bulk_update_objects_with_permission(self):
if not self.csv_update_data: if not hasattr(self, 'csv_update_data'):
raise NotImplementedError("The test must define csv_update_data.") raise NotImplementedError("The test must define csv_update_data.")
initial_count = self._get_queryset().count()
data = { data = {
'csv': self._get_csv_data(), 'csv': self._get_csv_data(),
} }
@ -608,7 +609,7 @@ class ViewTestCases:
obj_perm.users.add(self.user) obj_perm.users.add(self.user)
obj_perm.object_types.add(ContentType.objects.get_for_model(self.model)) obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) # self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200)
count = self._get_queryset().count() count = self._get_queryset().count()
# Now try update the data # Now try update the data

4
netbox/wireless/tests/test_views.py
View File

@ -32,14 +32,14 @@ class WirelessLANGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase):
cls.csv_data = ( cls.csv_data = (
"name,slug,description", "name,slug,description",
"Wireles sLAN Group 4,wireless-lan-group-4,Fourth wireless LAN group", "Wireless LAN Group 4,wireless-lan-group-4,Fourth wireless LAN group",
"Wireless LAN Group 5,wireless-lan-group-5,Fifth wireless LAN group", "Wireless LAN Group 5,wireless-lan-group-5,Fifth wireless LAN group",
"Wireless LAN Group 6,wireless-lan-group-6,Sixth wireless LAN group", "Wireless LAN Group 6,wireless-lan-group-6,Sixth wireless LAN group",
) )
cls.csv_update_data = ( cls.csv_update_data = (
"id,name,description", "id,name,description",
f"{groups[0].pk},Wireles sLAN Group 7,Fourth wireless LAN group7", f"{groups[0].pk},Wireless LAN Group 7,Fourth wireless LAN group7",
f"{groups[1].pk},Wireless LAN Group 8,Fifth wireless LAN group8", f"{groups[1].pk},Wireless LAN Group 8,Fifth wireless LAN group8",
f"{groups[2].pk},Wireless LAN Group 9,Sixth wireless LAN group9", f"{groups[2].pk},Wireless LAN Group 9,Sixth wireless LAN group9",
) )