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

do not introspect extra_vars, speed up tests, add base case test

Browse Source
This commit is contained in:
AlanCoding
2016-09-29 16:42:41 -04:00
parent f82b10f018
commit 115dfac471
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/access.py
View File

@@ -1105,10 +1105,7 @@ class JobAccess(BaseAccess):
job_fields[fd] = getattr(obj, fd) job_fields[fd] = getattr(obj, fd)
accepted_fields, ignored_fields = obj.job_template._accept_or_ignore_job_kwargs(**job_fields) accepted_fields, ignored_fields = obj.job_template._accept_or_ignore_job_kwargs(**job_fields)
for fd in ignored_fields: for fd in ignored_fields:
if fd == 'extra_vars': if fd != 'extra_vars' and job_fields[fd] != getattr(obj.job_template, fd):
if ignored_fields[fd]:
prompts_access = False
elif job_fields[fd] != getattr(obj.job_template, fd):
# Job has field that is not promptable # Job has field that is not promptable
prompts_access = False prompts_access = False
if obj.credential != obj.job_template.credential and not credential_access: if obj.credential != obj.job_template.credential and not credential_access:

25
awx/main/tests/functional/test_rbac_job_start.py
View File

@@ -45,26 +45,25 @@ def test_inventory_use_access(inventory, user):
@pytest.mark.django_db @pytest.mark.django_db
class TestJobRelaunchAccess: class TestJobRelaunchAccess:
@pytest.fixture @pytest.fixture
def jt_no_prompts(self, machine_credential, inventory): def job_no_prompts(self, machine_credential, inventory):
return JobTemplate.objects.create(name='test-job_template', credential=machine_credential, inventory=inventory) jt = JobTemplate.objects.create(name='test-job_template', credential=machine_credential, inventory=inventory)
return jt.create_unified_job()
@pytest.fixture @pytest.fixture
def jt_with_prompts(self, jt_no_prompts): def job_with_prompts(self, machine_credential, inventory, organization):
jt_no_prompts.update( jt = JobTemplate.objects.create(
name='test-job-template-prompts', credential=machine_credential, inventory=inventory,
ask_tags_on_launch=True, ask_variables_on_launch=True, ask_skip_tags_on_launch=True, ask_tags_on_launch=True, ask_variables_on_launch=True, ask_skip_tags_on_launch=True,
ask_limit_on_launch=True, ask_job_type_on_launch=True, ask_inventory_on_launch=True, ask_limit_on_launch=True, ask_job_type_on_launch=True, ask_inventory_on_launch=True,
ask_credential_on_launch=True) ask_credential_on_launch=True)
return jt_no_prompts
@pytest.fixture
def job_no_prompts(self, jt_no_prompts):
return jt_no_prompts.create_unified_job()
@pytest.fixture
def job_with_prompts(self, jt_with_prompts, organization):
new_cred = Credential.objects.create(name='new-cred', kind='ssh', username='test_user', password='pas4word') new_cred = Credential.objects.create(name='new-cred', kind='ssh', username='test_user', password='pas4word')
new_inv = Inventory.objects.create(name='new-inv', organization=organization) new_inv = Inventory.objects.create(name='new-inv', organization=organization)
return jt_with_prompts.create_unified_job(credential=new_cred, inventory=new_inv) return jt.create_unified_job(credential=new_cred, inventory=new_inv)
def test_normal_relaunch_via_job_template(self, job_no_prompts, rando):
"Has JT execute_role, job unchanged relative to JT"
job_no_prompts.job_template.execute_role.members.add(rando)
assert rando.can_access(Job, 'start', job_no_prompts)
def test_no_relaunch_without_prompted_fields_access(self, job_with_prompts, rando): def test_no_relaunch_without_prompted_fields_access(self, job_with_prompts, rando):
"Has JT execute_role but no use_role on inventory & credential - deny relaunch" "Has JT execute_role but no use_role on inventory & credential - deny relaunch"