diff options
author | Tim Bielawa <tbielawa@redhat.com> | 2016-08-26 08:53:45 -0700 |
---|---|---|
committer | Tim Bielawa <tbielawa@redhat.com> | 2016-08-26 09:07:27 -0700 |
commit | c959f9dcf9f4bc0c3dfeb4e68c082c79d479de35 (patch) | |
tree | 22b2113c38ca597f7658d7a30e7873d37916a207 /utils/Makefile | |
parent | 577195e3eefe19b95e39f0f52834cd3dc8f77cdf (diff) | |
download | openshift-c959f9dcf9f4bc0c3dfeb4e68c082c79d479de35.tar.gz openshift-c959f9dcf9f4bc0c3dfeb4e68c082c79d479de35.tar.bz2 openshift-c959f9dcf9f4bc0c3dfeb4e68c082c79d479de35.tar.xz openshift-c959f9dcf9f4bc0c3dfeb4e68c082c79d479de35.zip |
Fix PyLint errors discovered when upgrading to newer version
* Fixes PyLint to run in the virtualenv used for all tests
* Replaced 'LooseVersion' with 'parse_version' from setuptools
- This is a work around for the issue in
https://github.com/PyCQA/pylint/issues/73 in which pylint can not
import disutils.version correctly in a virtualenv.
* Removed the unused function 'delete_hosts' which was causing a
pylint error as well
* Removed a deprecated pylint pragma option, 'bad-builtin'
* Fixed some import ordering issues it was picky about
* Added another disable for a case where the PyLint suggestion would
have us altering the container we would be iterating over
* Add code-coverage reports to the unittests with the MINIMUM coverage
percentage for success set to 70%
- Current test coverage is at 76%
Diffstat (limited to 'utils/Makefile')
-rw-r--r-- | utils/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/utils/Makefile b/utils/Makefile index dd0b5cdd0..7676354b0 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -35,13 +35,17 @@ clean: @rm -fR build dist rpm-build MANIFEST htmlcov .coverage cover ooinstall.egg-info oo-install @rm -fR $(NAME)env +viewcover: + xdg-open cover/index.html + virtualenv: @echo "#############################################" @echo "# Creating a virtualenv" @echo "#############################################" virtualenv $(NAME)env . $(NAME)env/bin/activate && pip install -r requirements.txt - . $(NAME)env/bin/activate && pip install pep8 nose coverage mock flake8 PyYAML click + . $(NAME)env/bin/activate && pip install setuptools --upgrade + . $(NAME)env/bin/activate && pip install enum configparser pylint pep8 nose coverage mock flake8 PyYAML click # If there are any special things to install do it here # . $(NAME)env/bin/activate && INSTALL STUFF @@ -50,14 +54,14 @@ ci-unittests: @echo "#############################################" @echo "# Running Unit Tests in virtualenv" @echo "#############################################" -# . $(NAME)env/bin/activate && nosetests -v --with-cover --cover-html --cover-min-percentage=80 --cover-package=$(TESTPACKAGE) test/ - . $(NAME)env/bin/activate && nosetests -v test/ + . $(NAME)env/bin/activate && nosetests -v --with-coverage --cover-html --cover-min-percentage=70 --cover-package=$(SHORTNAME) test/ + @echo "VIEW CODE COVERAGE REPORT WITH 'xdg-open cover/index.html' or run 'make viewcover'" ci-pylint: @echo "#############################################" @echo "# Running PyLint Tests in virtualenv" @echo "#############################################" - python -m pylint --rcfile ../git/.pylintrc src/ooinstall/cli_installer.py src/ooinstall/oo_config.py src/ooinstall/openshift_ansible.py src/ooinstall/variants.py + . $(NAME)env/bin/activate && python -m pylint --rcfile ../git/.pylintrc src/ooinstall/cli_installer.py src/ooinstall/oo_config.py src/ooinstall/openshift_ansible.py src/ooinstall/variants.py ci-list-deps: @echo "#############################################" |