summaryrefslogtreecommitdiffstats
path: root/utils/src/ooinstall/oo_config.py
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2016-08-26 08:53:45 -0700
committerTim Bielawa <tbielawa@redhat.com>2016-08-26 09:07:27 -0700
commitc959f9dcf9f4bc0c3dfeb4e68c082c79d479de35 (patch)
tree22b2113c38ca597f7658d7a30e7873d37916a207 /utils/src/ooinstall/oo_config.py
parent577195e3eefe19b95e39f0f52834cd3dc8f77cdf (diff)
downloadopenshift-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/src/ooinstall/oo_config.py')
-rw-r--r--utils/src/ooinstall/oo_config.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py
index b9f0cc65c..409276360 100644
--- a/utils/src/ooinstall/oo_config.py
+++ b/utils/src/ooinstall/oo_config.py
@@ -2,10 +2,11 @@
import os
import sys
+import logging
import yaml
from pkg_resources import resource_filename
-import logging
+
installer_log = logging.getLogger('installer')
CONFIG_PERSIST_SETTINGS = [
@@ -325,6 +326,10 @@ class OOConfig(object):
self.settings['ansible_inventory_path'] = \
'{}/hosts'.format(os.path.dirname(self.config_path))
+ # pylint: disable=consider-iterating-dictionary
+ # Disabled because we shouldn't alter the container we're
+ # iterating over
+ #
# clean up any empty sets
for setting in self.settings.keys():
if not self.settings[setting]: