openstack
/
charm-cinder-ceph
Code Issues Proposed changes

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: I868a0555fe3d042a3c1620d0d296a28f9bf58737
This commit is contained in:
Billy Olsen 2016-03-15 20:08:45 -07:00
parent 4d1d17dfef
commit 5a9a365141
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -2,14 +2,11 @@
PYTHON := /usr/bin/env python
lint:
@flake8 --exclude hooks/charmhelpers,tests/charmhelpers \
hooks unit_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...