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

Merge pull request #4537 from jbradberry/fix-project-test

Browse Source 
Fix asserts in test_project.py to use the id directly off of the job template

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-08-22 14:52:35 +00:00
committed by GitHub
parent 045578ce22 ed1c667418
commit 8566c30557
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/main/tests/functional/api/test_project.py
View File

@@ -59,7 +59,7 @@ def test_no_changing_overwrite_behavior_if_used(post, patch, organization, admin
user=admin_user,
expect=201
)
JobTemplate.objects.create(
jt = JobTemplate.objects.create(
name='provides branch', project_id=r1.data['id'],
playbook='helloworld.yml',
scm_branch='foobar'
@@ -70,9 +70,10 @@ def test_no_changing_overwrite_behavior_if_used(post, patch, organization, admin
user=admin_user,
expect=400
)
p = Project.objects.get(pk=r1.data['id'])
assert 'job templates depend on branch override behavior for this project' in str(r2.data['allow_override'])
assert 'ids: 2' in str(r2.data['allow_override'])
assert Project.objects.get(pk=r1.data['id']).allow_override is True
assert 'ids: {}'.format(jt.id) in str(r2.data['allow_override'])
assert p.allow_override is True
@pytest.mark.django_db