External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 01:47:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6952 from AlanCoding/314_merge_tests

Browse Source 
Unit test fixes from 3.1.4 merge
This commit is contained in:
Alan Rominger
2017-07-10 11:21:13 -04:00
committed by GitHub
parent 7fda3c0658 613b9205b8
commit 1a46f7b451
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/main/tests/functional/api/test_generic.py
View File

@@ -1,11 +1,11 @@
import pytest import pytest
from django.core.urlresolvers import reverse from awx.api.versioning import reverse
@pytest.mark.django_db @pytest.mark.django_db
def test_proxy_ip_whitelist(get, patch, admin): 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={ patch(url, user=admin, data={
'REMOTE_HOST_HEADERS': [ 'REMOTE_HOST_HEADERS': [
'HTTP_X_FROM_THE_LOAD_BALANCER', 'HTTP_X_FROM_THE_LOAD_BALANCER',

2
awx/main/utils/formatters.py
View File

@@ -39,8 +39,6 @@ class LogstashFormatter(LogstashFormatterVersion1):
return raw_data return raw_data
elif kind == 'system_tracking': elif kind == 'system_tracking':
data = copy(raw_data['ansible_facts']) data = copy(raw_data['ansible_facts'])
elif kind == 'job_events':
data = copy(raw_data['event_model_data'])
else: else:
data = copy(raw_data) data = copy(raw_data)
if isinstance(data, basestring): if isinstance(data, basestring):