From 1a0e4b582e45d426fc08489e4f708c1f4b4d65a1 Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Tue, 15 Mar 2016 20:09:10 -0700 Subject: [PATCH] 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: I6c81235f3278647ad3d8155f1d985d1d5d288c2d --- Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index bdc159e4..4a07c243 100644 --- a/Makefile +++ b/Makefile @@ -2,14 +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. @echo Starting unit tests... - @$(PYTHON) /usr/bin/nosetests -v --nologcapture --with-coverage unit_tests + @tox -e py27 functional_test: @echo Starting Amulet tests...