summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRyan Petrello <rpetrell@redhat.com>2019-04-12 17:54:51 +0200
committerRyan Petrello <rpetrell@redhat.com>2019-04-12 22:11:23 +0200
commit17a803f49cc46a4c010c8c3b61cb12ad92237d9f (patch)
treee5d01ac1401707e8ca09fbe9530fbeed2981eb9a /Makefile
parentMerge pull request #3692 from ansible/spinnycheck (diff)
downloadawx-17a803f49cc46a4c010c8c3b61cb12ad92237d9f.tar.xz
awx-17a803f49cc46a4c010c8c3b61cb12ad92237d9f.zip
remove the old callback plugin import paths and callback-specific tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 1 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 3bd09b714a..3213ca3ea1 100644
--- a/Makefile
+++ b/Makefile
@@ -60,7 +60,7 @@ I18N_FLAG_FILE = .i18n_built
.PHONY: awx-link clean clean-tmp clean-venv requirements requirements_dev \
develop refresh adduser migrate dbchange dbshell runserver \
- receiver test test_unit test_ansible test_coverage coverage_html \
+ receiver test test_unit test_coverage coverage_html \
dev_build release_build release_clean sdist \
ui-docker-machine ui-docker ui-release ui-devel \
ui-test ui-deps ui-test-ci VERSION
@@ -378,20 +378,12 @@ test:
PYTHONDONTWRITEBYTECODE=1 py.test -p no:cacheprovider -n auto $(TEST_DIRS)
awx-manage check_migrations --dry-run --check -n 'vNNN_missing_migration_file'
-test_combined: test_ansible test
-
test_unit:
@if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/awx/bin/activate; \
fi; \
py.test awx/main/tests/unit awx/conf/tests/unit awx/sso/tests/unit
-test_ansible:
- @if [ "$(VENV_BASE)" ]; then \
- . $(VENV_BASE)/ansible/bin/activate; \
- fi; \
- py.test awx/lib/tests -c awx/lib/tests/pytest.ini
-
# Run all API unit tests with coverage enabled.
test_coverage:
@if [ "$(VENV_BASE)" ]; then \