From 7767df1e42e71f992b706e225e677b666a032141 Mon Sep 17 00:00:00 2001 From: Kenny Woodson Date: Mon, 30 Jan 2017 16:18:07 -0500 Subject: Fixing for tox tests. (flake8|pylint) --- roles/lib_openshift/library/oc_service.py | 2 ++ roles/lib_openshift/src/class/oc_service.py | 1 + roles/lib_openshift/src/lib/service.py | 2 ++ roles/lib_openshift/src/test/integration/oc_service.yml | 1 - 4 files changed, 5 insertions(+), 1 deletion(-) (limited to 'roles/lib_openshift') diff --git a/roles/lib_openshift/library/oc_service.py b/roles/lib_openshift/library/oc_service.py index a45e70fa8..9929d4aec 100644 --- a/roles/lib_openshift/library/oc_service.py +++ b/roles/lib_openshift/library/oc_service.py @@ -1269,6 +1269,7 @@ class OpenShiftCLIConfig(object): # -*- -*- -*- Begin included fragment: lib/service.py -*- -*- -*- + # pylint: disable=too-many-instance-attributes class ServiceConfig(object): ''' Handle service options ''' @@ -1476,6 +1477,7 @@ class OCService(OpenShiftCLI): skip = ['clusterIP', 'portalIP'] return not Utils.check_def_equal(self.user_svc.yaml_dict, self.service.yaml_dict, skip_keys=skip, debug=True) + # pylint: disable=too-many-return-statements,too-many-branches @staticmethod def run_ansible(params, check_mode): '''Run the idempotent ansible code''' diff --git a/roles/lib_openshift/src/class/oc_service.py b/roles/lib_openshift/src/class/oc_service.py index 1b92a45b2..4ebb732ad 100644 --- a/roles/lib_openshift/src/class/oc_service.py +++ b/roles/lib_openshift/src/class/oc_service.py @@ -81,6 +81,7 @@ class OCService(OpenShiftCLI): skip = ['clusterIP', 'portalIP'] return not Utils.check_def_equal(self.user_svc.yaml_dict, self.service.yaml_dict, skip_keys=skip, debug=True) + # pylint: disable=too-many-return-statements,too-many-branches @staticmethod def run_ansible(params, check_mode): '''Run the idempotent ansible code''' diff --git a/roles/lib_openshift/src/lib/service.py b/roles/lib_openshift/src/lib/service.py index 4f69fca9b..581487482 100644 --- a/roles/lib_openshift/src/lib/service.py +++ b/roles/lib_openshift/src/lib/service.py @@ -1,4 +1,6 @@ # pylint: skip-file +# flake8: noqa + # pylint: disable=too-many-instance-attributes class ServiceConfig(object): diff --git a/roles/lib_openshift/src/test/integration/oc_service.yml b/roles/lib_openshift/src/test/integration/oc_service.yml index a76fd746c..616694382 100755 --- a/roles/lib_openshift/src/test/integration/oc_service.yml +++ b/roles/lib_openshift/src/test/integration/oc_service.yml @@ -126,4 +126,3 @@ - svc_out.results.returncode == 1 - "'not found' in svc_out.results.stderr" msg: service get failed - -- cgit v1.2.3