External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 17:37:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3001 from anoek/misc-fixes

Browse Source 
Minor migration fixes
This commit is contained in:
Akita Noek
2016-07-14 11:23:22 -04:00
committed by GitHub
parent deb1c1652b 6da6f48521
commit d39b9ff84f
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/tests/functional/test_rbac_credential.py
View File

@@ -28,8 +28,10 @@ def test_two_teams_same_cred_name(organization_factory):
rbac.migrate_credential(apps, None)
assert objects.teams.team1.member_role in cred1.admin_role.parents.all()
assert objects.teams.team2.member_role in cred2.admin_role.parents.all()
assert objects.teams.team1.admin_role in cred1.admin_role.parents.all()
assert objects.teams.team2.admin_role in cred2.admin_role.parents.all()
assert objects.teams.team1.member_role in cred1.use_role.parents.all()
assert objects.teams.team2.member_role in cred2.use_role.parents.all()
@pytest.mark.django_db
def test_credential_use_role(credential, user, permissions):
@@ -53,7 +55,7 @@ def test_credential_migration_team_member(credential, team, user, permissions):
rbac.migrate_credential(apps, None)
# Admin permissions post migration
assert u in credential.admin_role
assert u in credential.use_role
@pytest.mark.django_db
def test_credential_migration_team_admin(credential, team, user, permissions):