Merge pull request #6952 from AlanCoding/314_merge_tests

Unit test fixes from 3.1.4 merge

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',

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):