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

Merge pull request #79 from chrismeyersfsu/feature-survey_password_redact

Browse Source 
Feature survey password redact
This commit is contained in:
Chris Meyers
2015-02-18 15:32:59 -05:00
parent 6f2016f9c0 4f907c6645
commit ea49c78bde
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/main/models/jobs.py
View File

@@ -5,7 +5,6 @@
import hmac import hmac
import json import json
import logging import logging
import re
# Django # Django
from django.conf import settings from django.conf import settings

1
awx/main/tests/__init__.py
View File

@@ -14,4 +14,3 @@ from awx.main.tests.activity_stream import * # noqa
from awx.main.tests.schedules import * # noqa from awx.main.tests.schedules import * # noqa
from awx.main.tests.redact import * # noqa from awx.main.tests.redact import * # noqa
from awx.main.tests.views import * # noqa from awx.main.tests.views import * # noqa
from awx.main.tests.jobs import *

8
awx/main/tests/base.py
View File

@@ -448,9 +448,13 @@ class BaseTestMixin(QueueTestMixin):
elif response['Content-Type'].startswith('application/yaml'): elif response['Content-Type'].startswith('application/yaml'):
obj = yaml.safe_load(response.content) obj = yaml.safe_load(response.content)
elif response['Content-Type'].startswith('text/plain'): elif response['Content-Type'].startswith('text/plain'):
obj = { 'content': response.content } obj = {
'content': response.content
}
elif response['Content-Type'].startswith('text/html'): elif response['Content-Type'].startswith('text/html'):
obj = { 'content': response.content } obj = {
'content': response.content
}
else: else:
self.fail('Unsupport response content type %s' % response['Content-Type']) self.fail('Unsupport response content type %s' % response['Content-Type'])
else: else:

6
awx/main/tests/jobs/__init__.py
View File

@@ -1,3 +1,3 @@
from jobs_monolithic import * from awx.main.tests.jobs.jobs_monolithic import * # noqa
from survey_password import * from survey_password import * # noqa
from base import * from base import * # noqa

1
awx/main/tests/jobs/survey_password.py
View File

@@ -2,7 +2,6 @@
import json import json
# Django # Django
import django.test
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
# AWX # AWX

1
awx/main/tests/tasks.py
View File

@@ -13,7 +13,6 @@ import unittest
# Django # Django
from django.conf import settings from django.conf import settings
from django.test.utils import override_settings
from django.utils.timezone import now from django.utils.timezone import now
# Django-CRUM # Django-CRUM

2
setup.cfg Normal file → Executable file
View File

@@ -18,4 +18,4 @@ exclude=awx/lib/site-packages,awx/ui,awx/api/urls.py,awx/main/migrations,awx/mai
[flake8] [flake8]
ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E302,E303,E501,W291,W391,W293,E731 ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E302,E303,E501,W291,W391,W293,E731
exclude=awx/lib/site-packages,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/tests/data exclude=awx/lib/site-packages,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/tests/data,node_modules/,awx/projects/