External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 15:58:45 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixed old test expectations

Browse Source
This commit is contained in:
Akita Noek
2016-08-16 15:36:07 -04:00
parent 9c5c09169e
commit 91cd32d304
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/access.py
View File

@@ -655,7 +655,7 @@ class CredentialAccess(BaseAccess):
return False return False
# Cannot change the organization for a credential after it's been created # Cannot change the organization for a credential after it's been created
if 'organization' in data: if data and 'organization' in data:
organization_pk = get_pk_from_dict(data, 'organization') organization_pk = get_pk_from_dict(data, 'organization')
if (organization_pk and (not obj.organization or organization_pk != obj.organization.id)) \ if (organization_pk and (not obj.organization or organization_pk != obj.organization.id)) \
or (not organization_pk and obj.organization): or (not organization_pk and obj.organization):

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

@@ -133,29 +133,6 @@ def test_org_credential_access_member(alice, org_credential, credential):
'description': 'New description.', 'description': 'New description.',
'organization': None}) 'organization': None})
@pytest.mark.django_db
def test_credential_access_org_permissions(
org_admin, org_member, organization, org_credential, credential):
credential.admin_role.members.add(org_admin)
credential.admin_role.members.add(org_member)
org_credential.admin_role.members.add(org_member)
access = CredentialAccess(org_admin)
member_access = CredentialAccess(org_member)
# Org admin can move their own credential into their org
assert access.can_change(credential, {'organization': organization.pk})
# Org member can not
assert not member_access.can_change(credential, {
'organization': organization.pk})
# Org admin can remove a credential from their org
assert access.can_change(org_credential, {'organization': None})
# Org member can not
assert not member_access.can_change(org_credential, {'organization': None})
assert not member_access.can_change(org_credential, {
'user': org_member.pk, 'organization': None})
@pytest.mark.django_db @pytest.mark.django_db
def test_cred_job_template_xfail(user, deploy_jobtemplate): def test_cred_job_template_xfail(user, deploy_jobtemplate):
' Personal credential migration ' ' Personal credential migration '
@@ -256,11 +233,6 @@ def test_single_cred_multi_job_template_multi_org(user, organizations, credentia
credential.refresh_from_db() credential.refresh_from_db()
assert jts[0].credential != jts[1].credential assert jts[0].credential != jts[1].credential
assert access.can_change(jts[0].credential, {'organization': org.pk})
assert access.can_change(jts[1].credential, {'organization': org.pk})
orgs[0].admin_role.members.remove(a)
assert not access.can_change(jts[0].credential, {'organization': org.pk})
@pytest.mark.django_db @pytest.mark.django_db
def test_cred_inventory_source(user, inventory, credential): def test_cred_inventory_source(user, inventory, credential):