summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorWayne Witzel III <wwitzel@redhat.com>2016-01-27 19:42:58 +0100
committerWayne Witzel III <wwitzel@redhat.com>2016-02-02 00:37:56 +0100
commit3d4580611eedec18fa9928732dea44f77e1d6d57 (patch)
treead470126309ff45baca11b9f37234a2f01f2577f /Makefile
parentreorganzing tests folder (diff)
downloadawx-3d4580611eedec18fa9928732dea44f77e1d6d57.tar.xz
awx-3d4580611eedec18fa9928732dea44f77e1d6d57.zip
added pytest to requirements_dev
reworking test strucutre reworked pytest.ini, removed functional imports, updated req_dev remove unneeded __init__ files add testing checker to local_settings examples adding testing packages to system Python for docker
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index abb16932c6..3d406b106b 100644
--- a/Makefile
+++ b/Makefile
@@ -357,17 +357,17 @@ pylint: reports
@(set -o pipefail && $@ | reports/$@.report)
check: flake8 pep8 # pyflakes pylint
-
+
# Run all API unit tests.
test:
- $(PYTHON) manage.py test -v2 awx.main.tests
+ $(PYTHON) -m py.test awx/main/tests
test_unit:
$(PYTHON) -m py.test awx/main/tests/unit
# Run all API unit tests with coverage enabled.
test_coverage:
- coverage run manage.py test -v2 awx.main.tests
+ $(PYTHON) -m py.test --cov=awx awx/main/tests
# Output test coverage as HTML (into htmlcov directory).
coverage_html: