summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2016-12-09 07:32:05 -0800
committerTim Bielawa <tbielawa@redhat.com>2016-12-09 07:32:05 -0800
commitb66a5a667d89f73a9bccdeb0822a85c131340246 (patch)
tree961e0906a980d6770f50746e1858e415a8fbf212
parent8f5a4b9797dba039a12cad1a485477fae6e11688 (diff)
downloadopenshift-b66a5a667d89f73a9bccdeb0822a85c131340246.tar.gz
openshift-b66a5a667d89f73a9bccdeb0822a85c131340246.tar.bz2
openshift-b66a5a667d89f73a9bccdeb0822a85c131340246.tar.xz
openshift-b66a5a667d89f73a9bccdeb0822a85c131340246.zip
Make 'cover-erase' a config file setting. Move VENT target to pre-req for all ci-* targets
-rw-r--r--utils/Makefile12
-rw-r--r--utils/setup.cfg1
2 files changed, 7 insertions, 6 deletions
diff --git a/utils/Makefile b/utils/Makefile
index b2648bb56..ad6735cb5 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -75,33 +75,33 @@ $(VENV)/bin/activate: test-requirements.txt
# If there are any special things to install do it here
# . $(VENV)/bin/activate && INSTALL STUFF
-ci-unittests:
+ci-unittests: $(VENV)
@echo "#############################################"
@echo "# Running Unit Tests in virtualenv"
@echo "#############################################"
- . $(VENV)/bin/activate && python setup.py nosetests --cover-erase
+ . $(VENV)/bin/activate && python setup.py nosetests
@echo "VIEW CODE COVERAGE REPORT WITH 'xdg-open cover/index.html' or run 'make viewcover'"
-ci-pylint:
+ci-pylint: $(VENV)
@echo "#############################################"
@echo "# Running PyLint Tests in virtualenv"
@echo "#############################################"
. $(VENV)/bin/activate && python -m pylint --rcfile ../git/.pylintrc $(shell find ../ -name $(VENV) -prune -o -name ooinstall.egg-info -prune -o -name test -prune -o -name "*.py" -print)
-ci-list-deps:
+ci-list-deps: $(VENV)
@echo "#############################################"
@echo "# Listing all pip deps"
@echo "#############################################"
. $(VENV)/bin/activate && pip freeze
-ci-flake8:
+ci-flake8: $(VENV)
@echo "#############################################"
@echo "# Running Flake8 Compliance Tests in virtualenv"
@echo "#############################################"
. $(VENV)/bin/activate && flake8 --config=setup.cfg ../ --exclude="utils,../inventory"
. $(VENV)/bin/activate && python setup.py flake8
-ci: $(VENV) ci-list-deps ci-unittests ci-flake8 ci-pylint
+ci: ci-list-deps ci-unittests ci-flake8 ci-pylint
@echo
@echo "##################################################################################"
@echo "VIEW CODE COVERAGE REPORT WITH 'xdg-open cover/index.html' or run 'make viewcover'"
diff --git a/utils/setup.cfg b/utils/setup.cfg
index 18b4e3057..ee3288fc5 100644
--- a/utils/setup.cfg
+++ b/utils/setup.cfg
@@ -11,6 +11,7 @@ with-coverage=1
cover-html=1
cover-inclusive=1
cover-min-percentage=70
+cover-erase=1
detailed-errors=1
cover-branches=1