From 669d320bc64e41f879c047a39a66b8ec99bf4b1e Mon Sep 17 00:00:00 2001 From: Miroslav Los Date: Wed, 14 Aug 2019 17:29:33 +0200 Subject: DO_NOT_MERGE CSIT-1194 - Framework easy pylint improvements - force a python2 environment in tox for pylint - let pylint load some compiled modules for member checking - allow locally enabled pylint rules - ignore bad enum names - ignore complexity for code to be refactored by other tickets - broad excepts are acceptable sometimes Signed-off-by: Miroslav Los Change-Id: If4c3a1b85e8609f074e1de8ce91fc9c4fedbeb38 --- resources/libraries/python/VatExecutor.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'resources/libraries/python/VatExecutor.py') diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py index 8197b5eae9..1d0a2133c0 100644 --- a/resources/libraries/python/VatExecutor.py +++ b/resources/libraries/python/VatExecutor.py @@ -252,7 +252,7 @@ class VatTerminal(object): self._tty, 'sudo -S {0}{1}'.format(Constants.VAT_BIN_NAME, json_text), self.__VAT_PROMPT) - except Exception: + except Exception: #pylint: disable=broad-except continue else: break @@ -306,10 +306,9 @@ class VatTerminal(object): raise RuntimeError("More instances of VPP running on node " "{0}. VAT command {1} execution failed.". format(self._node['host'], cmd)) - else: - raise RuntimeError("VPP not running on node {0}. VAT command " - "{1} execution failed.". - format(self._node['host'], cmd)) + raise RuntimeError("VPP not running on node {0}. VAT command " + "{1} execution failed.". + format(self._node['host'], cmd)) logger.debug("VAT output: {0}".format(out)) if self.json: -- cgit 1.2.3-korg