diff options
| author | AlanCoding <arominge@redhat.com> | 2018-04-16 15:49:45 +0200 |
|---|---|---|
| committer | AlanCoding <arominge@redhat.com> | 2018-04-16 16:32:51 +0200 |
| commit | 5eaffb352077b63569d274313626e907cb909c9d (patch) | |
| tree | e07af5c084afd778e20d371f5f3e302cdb866073 /Makefile | |
| parent | Merge pull request #1286 from AlanCoding/remove_user_roles (diff) | |
| download | awx-5eaffb352077b63569d274313626e907cb909c9d.tar.xz awx-5eaffb352077b63569d274313626e907cb909c9d.zip | |
run ansible tests separately
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -369,12 +369,14 @@ check: flake8 pep8 # pyflakes pylint TEST_DIRS ?= awx/main/tests/unit awx/main/tests/functional awx/conf/tests awx/sso/tests # Run all API unit tests. -test: test_ansible +test: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ fi; \ py.test $(TEST_DIRS) +test_combined: test_ansible test + test_unit: @if [ "$(VENV_BASE)" ]; then \ . $(VENV_BASE)/awx/bin/activate; \ |