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

Merge pull request #180 from chrismeyersfsu/fix-7383

Browse Source 
fix single update_on_project_update per-inventory
This commit is contained in:
Chris Meyers
2017-08-07 10:57:01 -04:00
committed by GitHub
parent 085a722060 95c12ac1ab
commit 8574c6ef4a
4 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tests/functional/api/test_inventory.py
View File

@@ -404,9 +404,8 @@ class TestControlledBySCM:
{'update_on_project_update': True,},
admin_user, expect=400)
content = json.loads(res.content)
assert content['update_on_project_update'] == ["Cannot update SCM-based inventory source on launch if set to update on "
"project update. Instead, configure the corresponding source project to "
"update on launch."]
assert content['update_on_project_update'] == ["More than one SCM-based inventory source with update on project update "
"on per-inventory not allowed."]
def test_adding_inv_src_without_proj_access_prohibited(self, post, project, inventory, rando):
inventory.admin_role.members.add(rando)

3
awx/main/tests/functional/models/test_inventory.py
View File

@@ -58,6 +58,9 @@ class TestSCMClean:
inv_src1.clean_update_on_project_update()
inv_src1.save()
inv_src1.source_vars = '---\nhello: world'
inv_src1.clean_update_on_project_update()
inv_src2 = InventorySource(inventory=inventory,
update_on_project_update=True,
source='scm')