openstack/charm-glance
Code Issues Proposed changes

Use tox in Makefile targets

Browse Source 
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
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
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 Amulet tests... @echo Starting Amulet tests...