From c7e9a831d91e05e92f1df86af33095999067ae74 Mon Sep 17 00:00:00 2001 From: Jason Novinger Date: Tue, 9 Sep 2025 16:11:59 -0500 Subject: [PATCH] Consolidate scenario name retrieval into method --- netbox/utilities/testing/views.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/netbox/utilities/testing/views.py b/netbox/utilities/testing/views.py index 8ce103738..f00b21d08 100644 --- a/netbox/utilities/testing/views.py +++ b/netbox/utilities/testing/views.py @@ -622,6 +622,9 @@ class ViewTestCases: 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'): """ 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=[]) 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 obj_perm = ObjectPermission(name='Test permission', actions=['add']) obj_perm.save() @@ -669,7 +670,7 @@ class ViewTestCases: self.assertHttpStatus(self.client.get(self._get_url('bulk_import')), 200) # Test each scenario - for scenario_name in scenarios: + for scenario_name in self.get_scenarios(): with self.cleanupSubTest(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=[]) 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) obj_perm = ObjectPermission( name='Test permission', @@ -770,7 +769,7 @@ class ViewTestCases: obj_perm.object_types.add(ObjectType.objects.get_for_model(self.model)) # Test each scenario with constrained permissions - for scenario_name in scenarios: + for scenario_name in self.get_scenarios(): with self.cleanupSubTest(scenario=scenario_name): self._test_bulk_import_constrained_scenario(scenario_name, obj_perm)