From 0be3747c013d2e459832111f89301d0b71d1bc93 Mon Sep 17 00:00:00 2001 From: Arthur Date: Thu, 27 Oct 2022 08:45:12 -0700 Subject: [PATCH] 7961 update tests remove redundant code --- netbox/ipam/tests/test_views.py | 1 - netbox/netbox/views/generic/bulk_views.py | 6 +++--- netbox/utilities/testing/views.py | 5 +++-- netbox/wireless/tests/test_views.py | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/netbox/ipam/tests/test_views.py b/netbox/ipam/tests/test_views.py index f9b03b64a..25b8af9ae 100644 --- a/netbox/ipam/tests/test_views.py +++ b/netbox/ipam/tests/test_views.py @@ -921,7 +921,6 @@ class L2VPNTerminationTestCase( device = create_test_device('Device 1') 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) - l2vpn2 = L2VPN.objects.create(name='L2VPN 2', slug='l2vpn-2', type=L2VPNTypeChoices.TYPE_VXLAN, identifier=650002) vlans = ( VLAN(name='Vlan 1', vid=1001), diff --git a/netbox/netbox/views/generic/bulk_views.py b/netbox/netbox/views/generic/bulk_views.py index 175ce7d54..5d7b4eff0 100644 --- a/netbox/netbox/views/generic/bulk_views.py +++ b/netbox/netbox/views/generic/bulk_views.py @@ -331,7 +331,7 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView): def _update_objects(self, form, request, headers, records): from utilities.forms import CSVModelChoiceField - new_objs = [] + updated_objs = [] ids = [int(record["id"]) for record in records] qs = self.queryset.model.objects.filter(id__in=ids) @@ -356,13 +356,13 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView): if obj_form.is_valid(): obj = self._save_obj(obj_form, request) - new_objs.append(obj) + updated_objs.append(obj) else: for field, err in obj_form.errors.items(): form.add_error('csv', f'Row {row} {field}: {err[0]}') raise ValidationError("") - return new_objs + return updated_objs def _create_objects(self, form, request, headers, records): new_objs = [] diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py index 2309ee1d2..91669666d 100644 --- a/netbox/utilities/testing/views.py +++ b/netbox/utilities/testing/views.py @@ -592,9 +592,10 @@ class ViewTestCases: @override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) 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.") + initial_count = self._get_queryset().count() data = { 'csv': self._get_csv_data(), } @@ -608,7 +609,7 @@ class ViewTestCases: obj_perm.users.add(self.user) 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() # Now try update the data diff --git a/netbox/wireless/tests/test_views.py b/netbox/wireless/tests/test_views.py index 134a3671b..4e51f23b9 100644 --- a/netbox/wireless/tests/test_views.py +++ b/netbox/wireless/tests/test_views.py @@ -32,14 +32,14 @@ class WirelessLANGroupTestCase(ViewTestCases.OrganizationalObjectViewTestCase): cls.csv_data = ( "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 6,wireless-lan-group-6,Sixth wireless LAN group", ) cls.csv_update_data = ( "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[2].pk},Wireless LAN Group 9,Sixth wireless LAN group9", )