External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-22 11:25:08 -02:30
Code Issues Packages Projects Releases Wiki Activity

add awx.conf tests to our various test run environments

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

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

2
tools/docker-compose/unit-tests/docker-compose.yml
View File

@@ -8,7 +8,7 @@ services:
image: gcr.io/ansible-tower-engineering/unit-test-runner:latest image: gcr.io/ansible-tower-engineering/unit-test-runner:latest
environment: environment:
SWIG_FEATURES: "-cpperraswarn -includeall -I/usr/include/openssl" 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"] command: ["make test"]
volumes: volumes:
- ../../../:/tower_devel - ../../../:/tower_devel