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: I8f812b70050b0ae1638e4f77bb29054997054854
This commit is contained in:
Billy Olsen 2016-03-15 20:08:48 -07:00
parent a8f380b4cf
commit 783cdd2dc5

View File

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