NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-18 01:32:17 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Consolidate scenario name retrieval into method

Browse Source
This commit is contained in:
Jason Novinger
2025-09-09 16:11:59 -05:00
parent abb274dba7
commit c7e9a831d9
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -622,6 +622,9 @@ class ViewTestCases:
csv_data = () csv_data = ()
def get_scenarios(self):
return self.csv_data.keys() if isinstance(self.csv_data, dict) else ['default']
def _get_csv_data(self, scenario_name='default'): def _get_csv_data(self, scenario_name='default'):
""" """
Get CSV data for testing. Supports both tuple/list and dictionary formats. Get CSV data for testing. Supports both tuple/list and dictionary formats.
@@ -657,8 +660,6 @@ class ViewTestCases:
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[]) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[])
def test_bulk_import_objects_with_permission(self, post_import_callback=None): def test_bulk_import_objects_with_permission(self, post_import_callback=None):
scenarios = self.csv_data.keys() if isinstance(self.csv_data, dict) else ['default']
# Assign model-level permission once for all scenarios # Assign model-level permission once for all scenarios
obj_perm = ObjectPermission(name='Test permission', actions=['add']) obj_perm = ObjectPermission(name='Test permission', actions=['add'])
obj_perm.save() obj_perm.save()
@@ -669,7 +670,7 @@ class ViewTestCases:
self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200) self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200)
# Test each scenario # Test each scenario
for scenario_name in scenarios: for scenario_name in self.get_scenarios():
with self.cleanupSubTest(scenario=scenario_name): with self.cleanupSubTest(scenario=scenario_name):
self._test_bulk_import_with_permission_scenario(scenario_name) self._test_bulk_import_with_permission_scenario(scenario_name)
@@ -757,8 +758,6 @@ class ViewTestCases:
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[]) @override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[])
def test_bulk_import_objects_with_constrained_permission(self, post_import_callback=None): def test_bulk_import_objects_with_constrained_permission(self, post_import_callback=None):
scenarios = self.csv_data.keys() if isinstance(self.csv_data, dict) else ['default']
# Assign constrained permission (deny all initially) # Assign constrained permission (deny all initially)
obj_perm = ObjectPermission( obj_perm = ObjectPermission(
name='Test permission', name='Test permission',
@@ -770,7 +769,7 @@ class ViewTestCases:
obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
# Test each scenario with constrained permissions # Test each scenario with constrained permissions
for scenario_name in scenarios: for scenario_name in self.get_scenarios():
with self.cleanupSubTest(scenario=scenario_name): with self.cleanupSubTest(scenario=scenario_name):
self._test_bulk_import_constrained_scenario(scenario_name, obj_perm) self._test_bulk_import_constrained_scenario(scenario_name, obj_perm)