From 3d4580611eedec18fa9928732dea44f77e1d6d57 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wwitzel@redhat.com>
Date: Wed, 27 Jan 2016 13:42:58 -0500
Subject: 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
---
 Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'Makefile')

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:
-- 
cgit v1.2.3