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: Icf362e7e60844ea59a6d242c3507e9aadb1c3087
This commit is contained in:
Billy Olsen 2016-03-15 20:09:00 -07:00
parent 8790bc12d8
commit edfef7dd89
1 changed files with 2 additions and 5 deletions

View File

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