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

fix broken shippable test suite

Browse Source
This commit is contained in:
Ryan Petrello 2017-09-06 15:56:17 -07:00 committed by Ryan Petrello
parent 37c2d01260
commit 44702c5cfd
No known key found for this signature in database
GPG Key ID: F2AA5F2122351777
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/conf/tests/unit/test_settings.py
View File

@ -264,7 +264,7 @@ def test_setting_from_db_with_unicode(settings, mocker, encrypted):
# this simulates a bug in python-memcached; see https://github.com/linsomniac/python-memcached/issues/79
value = six.u('Iñtërnâtiônàlizætiøn').encode('utf-8')
setting_from_db = mocker.Mock(key='AWX_SOME_SETTING', value=value)
setting_from_db = mocker.Mock(id=1, key='AWX_SOME_SETTING', value=value)
mocks = mocker.Mock(**{
'order_by.return_value': mocker.Mock(**{
'__iter__': lambda self: iter([setting_from_db]),

2
setup.cfg
View File

@ -18,4 +18,4 @@ exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory/ec2.py,awx/plugins
[flake8]
ignore=E201,E203,E221,E225,E231,E241,E251,E261,E265,E303,E501,W291,W391,W293,E731,F405
exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/south_migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/
exclude=.tox,venv,awx/lib/site-packages,awx/plugins/inventory,awx/ui,awx/api/urls.py,awx/main/migrations,awx/main/south_migrations,awx/main/tests/data,node_modules/,awx/projects/,tools/docker,awx/settings/local_*.py,installer/openshift/settings.py,build/,installer/

3
tools/docker-compose/unit-tests/Dockerfile
View File

@ -1,5 +1,4 @@
ARG TAG=latest
FROM gcr.io/ansible-tower-engineering/awx_devel:$TAG
FROM gcr.io/ansible-tower-engineering/awx_devel:latest
# For UI tests
RUN yum install -y bzip2 gcc-c++