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

11617 fix test cases

Browse Source
This commit is contained in:
Arthur 2023-08-16 12:59:28 -07:00
parent a8784ad863
commit 760b85b841
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/netbox/tests/test_import.py
View File

@ -240,8 +240,8 @@ class CSVImportTestCase(ModelViewTestCase):
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
def test_invalid_header_csv(self): def test_invalid_header_csv(self):
csv_data = ( csv_data = (
'name,slug,tags,xxx', 'name,slug,xxx',
'Region 1,region-1,"alpha,bravo",yyy', 'Region 1,region-1,yyy',
) )
data = { data = {
@ -263,8 +263,8 @@ class CSVImportTestCase(ModelViewTestCase):
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
def test_invalid_header_yaml(self): def test_invalid_header_yaml(self):
csv_data = ( csv_data = (
'name,slug,tags,xxx', 'name,slug,xxx',
'Region 1,region-1,"alpha,bravo",yyy', 'Region 1,region-1,yyy',
) )
data = { data = {
@ -286,8 +286,8 @@ class CSVImportTestCase(ModelViewTestCase):
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
def test_invalid_header_json(self): def test_invalid_header_json(self):
csv_data = ( csv_data = (
'name,slug,tags,xxx', 'name,slug,xxx',
'Region 1,region-1,"alpha,bravo",yyy', 'Region 1,region-1,yyy',
) )
data = { data = {

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

@ -404,8 +404,13 @@ class BulkImportView(GetReturnURLMixin, BaseMultiObjectView):
required_fields = [ required_fields = [
name for name, field in form_fields.items() if field.required name for name, field in form_fields.items() if field.required
] ]
if not headers: if not headers:
headers = headers_to_dict(list(record.keys())) keys = list(record.keys())
if object_id:
keys.append("id")
headers = headers_to_dict(keys)
validate_import_headers(headers, form_fields, required_fields, allow_extra_columns=isinstance(model_form, (DeviceTypeImportForm, ModuleTypeImportForm))) validate_import_headers(headers, form_fields, required_fields, allow_extra_columns=isinstance(model_form, (DeviceTypeImportForm, ModuleTypeImportForm)))
# When updating, omit all form fields other than those specified in the record. (No # When updating, omit all form fields other than those specified in the record. (No

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

@ -668,7 +668,7 @@ class ViewTestCases:
self.assertHttpStatus(self.client.get(self._get_url('import')), 200) self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
# Test POST with permission # Test POST with permission
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1) self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
@ -692,7 +692,7 @@ class ViewTestCases:
self.assertHttpStatus(self.client.get(self._get_url('import')), 200) self.assertHttpStatus(self.client.get(self._get_url('import')), 200)
# Test POST with permission # Test POST with permission
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1) self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
@ -756,7 +756,7 @@ class ViewTestCases:
obj_perm.object_types.add(ContentType.objects.get_for_model(self.model)) obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
# Test POST with permission # Test POST with permission
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
self.assertEqual(initial_count, self._get_queryset().count()) self.assertEqual(initial_count, self._get_queryset().count())
reader = csv.DictReader(array, delimiter=',') reader = csv.DictReader(array, delimiter=',')
@ -794,7 +794,7 @@ class ViewTestCases:
obj_perm.object_types.add(ContentType.objects.get_for_model(self.model)) obj_perm.object_types.add(ContentType.objects.get_for_model(self.model))
# Test POST with permission # Test POST with permission
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
self.assertEqual(initial_count, self._get_queryset().count()) self.assertEqual(initial_count, self._get_queryset().count())
reader = csv.DictReader(array, delimiter=',') reader = csv.DictReader(array, delimiter=',')
@ -866,7 +866,7 @@ class ViewTestCases:
obj_perm.save() obj_perm.save()
# Import permitted objects # Import permitted objects
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1) self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1)
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*']) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'])
@ -896,7 +896,7 @@ class ViewTestCases:
obj_perm.save() obj_perm.save()
# Import permitted objects # Import permitted objects
self.assertHttpStatus(self.client.post(self._get_url('import'), data), 200) self.assertHttpStatus(self.client.post(self._get_url('import'), data), 302)
self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1) self.assertEqual(self._get_queryset().count(), initial_count + len(self.csv_data) - 1)
class BulkEditObjectsViewTestCase(ModelViewTestCase): class BulkEditObjectsViewTestCase(ModelViewTestCase):