From 613b9205b841e06791112dcf0e45de9d961cb1fa Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 10 Jul 2017 11:09:56 -0400 Subject: [PATCH] unit test fixes from 3.1.4 merge --- awx/main/tests/functional/api/test_generic.py | 4 ++-- awx/main/utils/formatters.py | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/awx/main/tests/functional/api/test_generic.py b/awx/main/tests/functional/api/test_generic.py index 94011f0c21..6b2d580d2d 100644 --- a/awx/main/tests/functional/api/test_generic.py +++ b/awx/main/tests/functional/api/test_generic.py @@ -1,11 +1,11 @@ import pytest -from django.core.urlresolvers import reverse +from awx.api.versioning import reverse @pytest.mark.django_db def test_proxy_ip_whitelist(get, patch, admin): - url = reverse('api:setting_singleton_detail', args=('system',)) + url = reverse('api:setting_singleton_detail', kwargs={'category_slug': 'system'}) patch(url, user=admin, data={ 'REMOTE_HOST_HEADERS': [ 'HTTP_X_FROM_THE_LOAD_BALANCER', diff --git a/awx/main/utils/formatters.py b/awx/main/utils/formatters.py index c0944746d0..12034dd5ea 100644 --- a/awx/main/utils/formatters.py +++ b/awx/main/utils/formatters.py @@ -39,8 +39,6 @@ class LogstashFormatter(LogstashFormatterVersion1): return raw_data elif kind == 'system_tracking': data = copy(raw_data['ansible_facts']) - elif kind == 'job_events': - data = copy(raw_data['event_model_data']) else: data = copy(raw_data) if isinstance(data, basestring):