Use tox in Makefile targets

Modify the Makefile to point at the appropriate tox targets
so that tox and Make output can be equivalent. This involves
mapping the lint target to the pep8 target and the test target
to the py27 target.

Change-Id: I652b17bd25ff663da2d4740cb94f0ab1a84a9849
This commit is contained in:
Billy Olsen 2016-03-15 20:08:51 -07:00
parent b55e6dc392
commit 1ea25b4034

View File

@ -2,13 +2,11 @@
PYTHON := /usr/bin/env python PYTHON := /usr/bin/env python
lint: lint:
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \ @tox -e pep8
actions hooks unit_tests tests
@charm proof
test: test:
@# Bundletester expects unit tests here. @echo Starting unit tests...
@$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests @tox -e py27
functional_test: functional_test:
@echo Starting all functional, lint and unit tests... @echo Starting all functional, lint and unit tests...