mirror of
https://github.com/ansible/awx.git
synced 2026-05-20 07:17:40 -02:30
Clear related job templates when inventory is deleted
This commit is contained in:
@@ -382,6 +382,7 @@ class Inventory(CommonModelNameNotUnique, ResourceMixin):
|
||||
raise RuntimeError("Inventory is already pending deletion.")
|
||||
self.pending_deletion = True
|
||||
self.save(update_fields=['pending_deletion'])
|
||||
self.jobtemplates.clear()
|
||||
self.websocket_emit_status('pending_deletion')
|
||||
delete_inventory.delay(self.pk)
|
||||
|
||||
|
||||
@@ -88,6 +88,20 @@ def test_async_inventory_duplicate_deletion_prevention(delete, get, inventory, a
|
||||
assert resp.data['error'] == 'Inventory is already pending deletion.'
|
||||
|
||||
|
||||
@pytest.mark.django_db
|
||||
def test_async_inventory_deletion_deletes_related_jt(delete, get, job_template, inventory, alice, admin):
|
||||
job_template.inventory = inventory
|
||||
job_template.save()
|
||||
assert job_template.inventory == inventory
|
||||
inventory.admin_role.members.add(alice)
|
||||
resp = delete(reverse('api:inventory_detail', kwargs={'pk': inventory.id}), alice)
|
||||
assert resp.status_code == 202
|
||||
|
||||
resp = get(reverse('api:job_template_detail', kwargs={'pk': job_template.id}), admin)
|
||||
jdata = json.loads(resp.content)
|
||||
assert jdata['inventory'] is None
|
||||
|
||||
|
||||
@pytest.mark.parametrize('order_by', ('script', '-script', 'script,pk', '-script,pk'))
|
||||
@pytest.mark.django_db
|
||||
def test_list_cannot_order_by_unsearchable_field(get, organization, alice, order_by):
|
||||
|
||||
Reference in New Issue
Block a user