Skip to content

Commit c7e9a83

Browse files
committed
Consolidate scenario name retrieval into method
1 parent abb274d commit c7e9a83

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

netbox/utilities/testing/views.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,9 @@ class BulkImportObjectsViewTestCase(ModelViewTestCase):
622622

623623
csv_data = ()
624624

625+
def get_scenarios(self):
626+
return self.csv_data.keys() if isinstance(self.csv_data, dict) else ['default']
627+
625628
def _get_csv_data(self, scenario_name='default'):
626629
"""
627630
Get CSV data for testing. Supports both tuple/list and dictionary formats.
@@ -657,8 +660,6 @@ def test_bulk_import_objects_without_permission(self):
657660

658661
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[])
659662
def test_bulk_import_objects_with_permission(self, post_import_callback=None):
660-
scenarios = self.csv_data.keys() if isinstance(self.csv_data, dict) else ['default']
661-
662663
# Assign model-level permission once for all scenarios
663664
obj_perm = ObjectPermission(name='Test permission', actions=['add'])
664665
obj_perm.save()
@@ -669,7 +670,7 @@ def test_bulk_import_objects_with_permission(self, post_import_callback=None):
669670
self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200)
670671

671672
# Test each scenario
672-
for scenario_name in scenarios:
673+
for scenario_name in self.get_scenarios():
673674
with self.cleanupSubTest(scenario=scenario_name):
674675
self._test_bulk_import_with_permission_scenario(scenario_name)
675676

@@ -757,8 +758,6 @@ def test_bulk_update_objects_with_permission(self):
757758

758759
@override_settings(EXEMPT_VIEW_PERMISSIONS=['*'], EXEMPT_EXCLUDE_MODELS=[])
759760
def test_bulk_import_objects_with_constrained_permission(self, post_import_callback=None):
760-
scenarios = self.csv_data.keys() if isinstance(self.csv_data, dict) else ['default']
761-
762761
# Assign constrained permission (deny all initially)
763762
obj_perm = ObjectPermission(
764763
name='Test permission',
@@ -770,7 +769,7 @@ def test_bulk_import_objects_with_constrained_permission(self, post_import_callb
770769
obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model))
771770

772771
# Test each scenario with constrained permissions
773-
for scenario_name in scenarios:
772+
for scenario_name in self.get_scenarios():
774773
with self.cleanupSubTest(scenario=scenario_name):
775774
self._test_bulk_import_constrained_scenario(scenario_name, obj_perm)
776775

0 commit comments

Comments
 (0)