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

SCM Inventory field name changes

Browse Source 
on InventorySource model
* scm_project -> source_project
on InventorySourceSerializer
* scm_inventories -> scm_inventory_sources

on InventoryUpdate model
* scm_project_update -> source_project_update
This commit is contained in:
AlanCoding
2017-05-04 09:15:29 -04:00
parent 24a04d56f1
commit d826c45ac6
11 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -203,7 +203,7 @@ def test_inventory_source_update(post, inventory_source, alice, role_field, expe
def scm_inventory(inventory, project):
inventory.inventory_sources.create(
name='foobar', update_on_project_update=True, source='scm',
scm_project=project)
source_project=project)
return inventory

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

@@ -237,7 +237,7 @@ def inventory(organization):
def scm_inventory_source(inventory, project):
return InventorySource.objects.create(
name="test-scm-inv",
scm_project=project,
source_project=project,
source='scm',
source_path='inventory_file',
update_on_project_update=True,

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

@@ -14,12 +14,12 @@ class TestSCMUpdateFeatures:
def test_automatic_project_update_on_create(self, inventory, project):
inv_src = InventorySource(
scm_project=project,
source_project=project,
source_path='inventory_file',
inventory=inventory,
update_on_project_update=True,
source='scm')
with mock.patch.object(inv_src.scm_project, 'update') as mck_update:
with mock.patch.object(inv_src.source_project, 'update') as mck_update:
inv_src.save()
mck_update.assert_called_once_with()
@@ -32,7 +32,7 @@ class TestSCMUpdateFeatures:
def test_no_unwanted_updates(self, scm_inventory_source):
# Changing the non-sensitive fields should not trigger update
with mock.patch.object(scm_inventory_source.scm_project, 'update') as mck_update:
with mock.patch.object(scm_inventory_source.source_project, 'update') as mck_update:
scm_inventory_source.name = 'edited_inventory'
scm_inventory_source.description = "I'm testing this!"
scm_inventory_source.save()

6
awx/main/tests/functional/test_tasks.py
View File

@@ -21,10 +21,10 @@ class TestDependentInventoryUpdate:
def test_dependent_inventory_updates_is_called(self, scm_inventory_source, scm_revision_file):
task = RunProjectUpdate()
task.revision_path = scm_revision_file
proj_update = ProjectUpdate.objects.create(project=scm_inventory_source.scm_project)
proj_update = ProjectUpdate.objects.create(project=scm_inventory_source.source_project)
with mock.patch.object(RunProjectUpdate, '_update_dependent_inventories') as inv_update_mck:
task.post_run_hook(proj_update, 'successful')
inv_update_mck.assert_called_once_with(scm_inventory_source.scm_project, mock.ANY)
inv_update_mck.assert_called_once_with(scm_inventory_source.source_project, mock.ANY)
def test_no_unwanted_dependent_inventory_updates(self, project, scm_revision_file):
task = RunProjectUpdate()
@@ -37,7 +37,7 @@ class TestDependentInventoryUpdate:
def test_dependent_inventory_updates(self, scm_inventory_source):
task = RunProjectUpdate()
with mock.patch.object(RunInventoryUpdate, 'run') as iu_run_mock:
task._update_dependent_inventories(scm_inventory_source.scm_project, [scm_inventory_source])
task._update_dependent_inventories(scm_inventory_source.source_project, [scm_inventory_source])
assert InventoryUpdate.objects.count() == 1
inv_update = InventoryUpdate.objects.first()
iu_run_mock.assert_called_once_with(inv_update.id)