External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-15 13:27:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6796 from wwitzel3/issue-4382

Browse Source 
Tweak background Inventory deletion.
This commit is contained in:
Wayne Witzel III
2017-06-29 09:26:23 -04:00
committed by GitHub
parent 79c19d14e5 ad95917db6
commit 363742b15e
6 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ def test_async_inventory_duplicate_deletion_prevention(delete, get, inventory, a
resp = delete(reverse('api:inventory_detail', kwargs={'pk': inventory.id}), alice)
assert resp.status_code == 400
assert resp.data['error'] == 'Inventory is already being deleted.'
assert resp.data['error'] == 'Inventory is already pending deletion.'
@pytest.mark.parametrize('order_by', ('script', '-script', 'script,pk', '-script,pk'))
@@ -314,12 +314,12 @@ class TestControlledBySCM:
@pytest.mark.django_db
class TestInsightsCredential:
def test_insights_credential(self, patch, insights_inventory, admin_user, insights_credential):
patch(insights_inventory.get_absolute_url(),
patch(insights_inventory.get_absolute_url(),
{'insights_credential': insights_credential.id}, admin_user,
expect=200)
def test_non_insights_credential(self, patch, insights_inventory, admin_user, scm_credential):
patch(insights_inventory.get_absolute_url(),
patch(insights_inventory.get_absolute_url(),
{'insights_credential': scm_credential.id}, admin_user,
expect=400)