add awx.conf tests to our various test run environments

This commit is contained in:
Ryan Petrello 2017-01-30 11:36:14 -05:00
parent d6857cf65a
commit 73cbcc2de0
2 changed files with 3 additions and 3 deletions

View File

@ -473,7 +473,7 @@ pylint: reports
check: flake8 pep8 # pyflakes pylint
TEST_DIRS ?= awx/main/tests
TEST_DIRS ?= awx/main/tests awx/conf/tests
# Run all API unit tests.
test:
@if [ "$(VENV_BASE)" ]; then \
@ -485,7 +485,7 @@ test_unit:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \
fi; \
py.test awx/main/tests/unit
py.test awx/main/tests/unit awx/conf/tests/unit
# Run all API unit tests with coverage enabled.
test_coverage:

View File

@ -8,7 +8,7 @@ services:
image: gcr.io/ansible-tower-engineering/unit-test-runner:latest
environment:
SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl"
TEST_DIRS: awx/main/tests/functional awx/main/tests/unit
TEST_DIRS: awx/main/tests/functional awx/main/tests/unit awx/conf/tests
command: ["make test"]
volumes:
- ../../../:/tower_devel