Fixture name change

awx/main/tests/functional/dab_rbac/test_dab_rbac_api.py

@@ -10,7 +10,7 @@
 
 
 @pytest.mark.django_db
-def test_managed_roles_created(managed_roles):
+def test_managed_roles_created(setup_managed_roles):
  "Managed RoleDefinitions are created in post_migration signal, we expect to see them here"
  for cls in (JobTemplate, Inventory):
  ct = ContentType.objects.get_for_model(cls)
@@ -22,7 +22,7 @@ def test_managed_roles_created(managed_roles):
 
 
 @pytest.mark.django_db
-def test_custom_read_role(admin_user, post, managed_roles):
+def test_custom_read_role(admin_user, post, setup_managed_roles):
  rd_url = django_reverse('roledefinition-list')
  resp = post(
  url=rd_url, data={"name": "read role made for test", "content_type": "awx.inventory", "permissions": ['view_inventory']}, user=admin_user, expect=201
@@ -40,7 +40,7 @@ def test_custom_system_roles_prohibited(admin_user, post):
 
 
 @pytest.mark.django_db
-def test_assignment_to_invisible_user(admin_user, alice, rando, inventory, post, managed_roles):
+def test_assignment_to_invisible_user(admin_user, alice, rando, inventory, post, setup_managed_roles):
  "Alice can not see rando, and so can not give them a role assignment"
  rd = RoleDefinition.objects.get(name='Inventory Admin')
  rd.give_permission(alice, inventory)
@@ -51,7 +51,7 @@ def test_assignment_to_invisible_user(admin_user, alice, rando, inventory, post,
 
 
 @pytest.mark.django_db
-def test_assign_managed_role(admin_user, alice, rando, inventory, post, managed_roles, organization):
+def test_assign_managed_role(admin_user, alice, rando, inventory, post, setup_managed_roles, organization):
  rd = RoleDefinition.objects.get(name='Inventory Admin')
  rd.give_permission(alice, inventory)
  # When alice and rando are members of the same org, they can see each other
@@ -78,7 +78,7 @@ def test_assign_custom_delete_role(admin_user, rando, inventory, delete, patch):
 
 
 @pytest.mark.django_db
-def test_assign_custom_add_role(admin_user, rando, organization, post, managed_roles):
+def test_assign_custom_add_role(admin_user, rando, organization, post, setup_managed_roles):
  rd, _ = RoleDefinition.objects.get_or_create(
  name='inventory-add', permissions=['add_inventory', 'view_organization'], content_type=ContentType.objects.get_for_model(Organization)
  )

awx/main/tests/functional/dab_rbac/test_translation_layer.py

@@ -18,7 +18,7 @@
  'role_name',
  ['execution_environment_admin_role', 'project_admin_role', 'admin_role', 'auditor_role', 'read_role', 'execute_role', 'notification_admin_role'],
 )
-def test_round_trip_roles(organization, rando, role_name, managed_roles):
+def test_round_trip_roles(organization, rando, role_name, setup_managed_roles):
  """
  Make an assignment with the old-style role,
  get the equivelent new role
@@ -64,7 +64,7 @@ def test_compat_role_naming(setup_managed_roles, job_template, rando, alice):
 
 
 @pytest.mark.django_db
-def test_organization_level_permissions(organization, inventory, managed_roles):
+def test_organization_level_permissions(organization, inventory, setup_managed_roles):
  u1 = User.objects.create(username='alice')
  u2 = User.objects.create(username='bob')
 
@@ -94,14 +94,14 @@ def test_organization_level_permissions(organization, inventory, managed_roles):
 
 
 @pytest.mark.django_db
-def test_organization_execute_role(organization, rando, managed_roles):
+def test_organization_execute_role(organization, rando, setup_managed_roles):
  organization.execute_role.members.add(rando)
  assert rando in organization.execute_role
  assert set(Organization.accessible_objects(rando, 'execute_role')) == set([organization])
 
 
 @pytest.mark.django_db
-def test_workflow_approval_list(get, post, admin_user, managed_roles):
+def test_workflow_approval_list(get, post, admin_user, setup_managed_roles):
  workflow_job_template = WorkflowJobTemplate.objects.create()
  approval_node = WorkflowJobTemplateNode.objects.create(workflow_job_template=workflow_job_template)
  url = reverse('api:workflow_job_template_node_create_approval', kwargs={'pk': approval_node.pk, 'version': 'v2'})
@@ -115,14 +115,14 @@ def test_workflow_approval_list(get, post, admin_user, managed_roles):
 
 
 @pytest.mark.django_db
-def test_creator_permission(rando, admin_user, inventory, managed_roles):
+def test_creator_permission(rando, admin_user, inventory, setup_managed_roles):
  give_creator_permissions(rando, inventory)
  assert rando in inventory.admin_role
  assert rando in inventory.admin_role.members.all()
 
 
 @pytest.mark.django_db
-def test_team_team_read_role(rando, team, admin_user, post, managed_roles):
+def test_team_team_read_role(rando, team, admin_user, post, setup_managed_roles):
  orgs = [Organization.objects.create(name=f'foo-{i}') for i in range(2)]
  teams = [Team.objects.create(name=f'foo-{i}', organization=orgs[i]) for i in range(2)]
  teams[1].member_role.members.add(rando)