From c4ffab8a3e710b45b84a6a8b934af2a5a14560c1 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Wed, 4 May 2016 15:31:37 -0400 Subject: [PATCH 1/2] Attempted fix of issue 1772 --- awx/api/serializers.py | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index fff5a1b75c..f223e6f7ee 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -78,7 +78,6 @@ SUMMARIZABLE_FK_FIELDS = { 'credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'), 'cloud_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'cloud'), 'network_credential': DEFAULT_SUMMARY_FIELDS + ('kind', 'net'), - 'permission': DEFAULT_SUMMARY_FIELDS, 'job': DEFAULT_SUMMARY_FIELDS + ('status', 'failed',), 'job_template': DEFAULT_SUMMARY_FIELDS, 'schedule': DEFAULT_SUMMARY_FIELDS + ('next_run',), From 082ca59812b830bb7c765e60a72ad6ae033e9219 Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Wed, 4 May 2016 17:12:51 -0400 Subject: [PATCH 2/2] Fixing missed test from period all the things update --- awx/main/tests/functional/api/test_job_runtime_params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/awx/main/tests/functional/api/test_job_runtime_params.py b/awx/main/tests/functional/api/test_job_runtime_params.py index bd79c7aab3..a1069da198 100644 --- a/awx/main/tests/functional/api/test_job_runtime_params.py +++ b/awx/main/tests/functional/api/test_job_runtime_params.py @@ -171,7 +171,7 @@ def test_job_launch_fails_without_inventory(deploy_jobtemplate, post, user): args=[deploy_jobtemplate.pk]), {}, user('admin', True)) assert response.status_code == 400 - assert response.data['inventory'] == ['Job Template Inventory is missing or undefined'] + assert response.data['inventory'] == ['Job Template Inventory is missing or undefined.'] @pytest.mark.django_db @pytest.mark.job_runtime_vars