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

Merge pull request #27 from AlanCoding/initial_sync

Browse Source 
Use "sync" type when doing SCM inv src update on create
This commit is contained in:
Alan Rominger
2017-07-24 21:20:08 -04:00
committed by GitHub
parent eb64d6e808 cc547af18b
commit 439ca6d32e
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,7 @@ from awx.main.models import InventorySource
@pytest.fixture
def scm_inventory(inventory, project):
with mock.patch.object(project, 'update'):
with mock.patch('awx.main.models.unified_jobs.UnifiedJobTemplate.update'):
inventory.inventory_sources.create(
name='foobar', update_on_project_update=True, source='scm',
source_project=project, scm_last_revision=project.scm_revision)

2
awx/main/tests/functional/conftest.py
View File

@@ -314,7 +314,7 @@ def scm_inventory_source(inventory, project):
update_on_project_update=True,
inventory=inventory,
scm_last_revision=project.scm_revision)
with mock.patch.object(inv_src.source_project, 'update'):
with mock.patch('awx.main.models.unified_jobs.UnifiedJobTemplate.update'):
inv_src.save()
return inv_src