diff --git a/awx/main/tests/functional/test_projects.py b/awx/main/tests/functional/test_projects.py index 8cf7b18ccb..d866e9c0e5 100644 --- a/awx/main/tests/functional/test_projects.py +++ b/awx/main/tests/functional/test_projects.py @@ -10,7 +10,7 @@ from awx.main.models import Project # Project listing and visibility tests # -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_user_project_list(get, project_factory, admin, alice, bob): 'List of projects a user has access to, filtered by projects you can also see' @@ -41,7 +41,7 @@ def test_user_project_list(get, project_factory, admin, alice, bob): assert get(reverse('api:user_projects_list', args=(admin.pk,)), alice).data['count'] == 2 -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_team_project_list(get, project_factory, team_factory, admin, alice, bob): 'List of projects a team has access to, filtered by projects you can also see' team1 = team_factory('team1') @@ -98,7 +98,7 @@ def test_team_project_list(get, project_factory, team_factory, admin, alice, bob -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_create_project(post, organization, org_admin, org_member, admin, rando): test_list = [rando, org_member, org_admin, admin] expected_status_codes = [403, 403, 201, 201] @@ -116,12 +116,12 @@ def test_create_project(post, organization, org_admin, org_member, admin, rando) assert not Project.objects.filter(name='Project %d' % i, organization=organization).exists() -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_cant_create_project_without_org(post, organization, org_admin, org_member, admin, rando): assert post(reverse('api:project_list'), { 'name': 'Project foo', }, admin).status_code == 400 assert post(reverse('api:project_list'), { 'name': 'Project foo', 'organization': None}, admin).status_code == 400 -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_create_project_through_org_link(post, organization, org_admin, org_member, admin, rando): test_list = [rando, org_member, org_admin, admin] expected_status_codes = [403, 403, 201, 201] diff --git a/awx/main/tests/functional/test_rbac_api.py b/awx/main/tests/functional/test_rbac_api.py index dc24bd8c6c..e50206d3f3 100644 --- a/awx/main/tests/functional/test_rbac_api.py +++ b/awx/main/tests/functional/test_rbac_api.py @@ -265,7 +265,7 @@ def test_remove_user_to_role(post, admin, role): post(url, {'disassociate': True, 'id': admin.id}, admin) assert role.members.filter(id=admin.id).count() == 0 -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_org_admin_add_user_to_job_template(post, organization, check_jobtemplate, user): 'Tests that a user with permissions to assign/revoke membership to a particular role can do so' org_admin = user('org-admin') @@ -275,12 +275,13 @@ def test_org_admin_add_user_to_job_template(post, organization, check_jobtemplat assert check_jobtemplate.accessible_by(org_admin, {'write': True}) is True assert check_jobtemplate.accessible_by(joe, {'execute': True}) is False - post(reverse('api:role_users_list', args=(check_jobtemplate.executor_role.id,)), {'id': joe.id}, org_admin) + res =post(reverse('api:role_users_list', args=(check_jobtemplate.executor_role.id,)), {'id': joe.id}, org_admin) + print(res.data) assert check_jobtemplate.accessible_by(joe, {'execute': True}) is True -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_org_admin_remove_user_to_job_template(post, organization, check_jobtemplate, user): 'Tests that a user with permissions to assign/revoke membership to a particular role can do so' org_admin = user('org-admin') @@ -295,7 +296,7 @@ def test_org_admin_remove_user_to_job_template(post, organization, check_jobtemp assert check_jobtemplate.accessible_by(joe, {'execute': True}) is False -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_user_fail_to_add_user_to_job_template(post, organization, check_jobtemplate, user): 'Tests that a user without permissions to assign/revoke membership to a particular role cannot do so' rando = user('rando') @@ -305,12 +306,13 @@ def test_user_fail_to_add_user_to_job_template(post, organization, check_jobtemp assert check_jobtemplate.accessible_by(joe, {'execute': True}) is False res = post(reverse('api:role_users_list', args=(check_jobtemplate.executor_role.id,)), {'id': joe.id}, rando) + print(res.data) assert res.status_code == 403 assert check_jobtemplate.accessible_by(joe, {'execute': True}) is False -@pytest.mark.django_db +@pytest.mark.django_db(transaction=True) def test_user_fail_to_remove_user_to_job_template(post, organization, check_jobtemplate, user): 'Tests that a user without permissions to assign/revoke membership to a particular role cannot do so' rando = user('rando')