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

Fix the custom script update to use the normal mechanism for trigger an

Browse Source 
inventory update
This commit is contained in:
Matthew Jones
2014-10-02 12:53:06 -04:00
parent 52fc81244d
commit b37925149b
1 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
awx/main/tests/inventory.py
View File

@@ -1193,10 +1193,13 @@ class InventoryUpdatesTest(BaseTransactionTest):
inv_src_url2 = reverse('api:inventory_source_detail', args=(inv_src_2.pk,)) inv_src_url2 = reverse('api:inventory_source_detail', args=(inv_src_2.pk,))
with self.current_user(self.super_django_user): with self.current_user(self.super_django_user):
data = self.get(inv_src_url2, expect=200) data = self.get(inv_src_url2, expect=200)
data.update({ if inventory_source.credential is not None:
'source': inventory_source.source, data.update({
'credential': inventory_source.credential.pk, 'source': inventory_source.source,
}) 'credential': inventory_source.credential.pk,
})
else:
data.update({'source': inventory_source.source})
response = self.put(inv_src_url2, data, expect=400) response = self.put(inv_src_url2, data, expect=400)
self.assertTrue('source' in response, response) self.assertTrue('source' in response, response)
# Make sure we can delete the inventory update. # Make sure we can delete the inventory update.
@@ -1576,11 +1579,4 @@ class InventoryUpdatesTest(BaseTransactionTest):
'source_script': script_data["id"]} 'source_script': script_data["id"]}
with self.current_user(self.super_django_user): with self.current_user(self.super_django_user):
response = self.put(custom_inv_src, inv_src_opts, expect=200) response = self.put(custom_inv_src, inv_src_opts, expect=200)
self.check_inventory_source(custom_group.inventory_source)
with self.current_user(self.super_django_user):
response = self.get(custom_inv_update, expect=200)
self.assertTrue(response['can_update'])
with self.current_user(self.super_django_user):
response = self.post(custom_inv_update, {}, expect=202)
custom_group = Group.objects.get(id=custom_group.id)
self.assertEqual(custom_group.hosts.all().count(), 4)