Fix pylint warnings/errors in cli

cli_testcase and cli_tier have been refactored to avoid duplicating
code. Then functest/cli and funtest/unit/cli can be added to the list
of modules rated 10/10.

Change-Id: Iec90e806397248a10f39080ec554e3f0a6eda7c1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 11 insertions, 12 deletions

diff --git a/functest/tests/unit/cli/commands/test_cli_env.py b/functest/tests/unit/cli/commands/test_cli_env.py
index b5c65377..e5c409bf 100644
--- a/functest/tests/unit/cli/commands/test_cli_env.py
+++ b/functest/tests/unit/cli/commands/test_cli_env.py
@@ -17,15 +17,13 @@ from functest.cli.commands import cli_env
 from functest.utils.constants import CONST
 
 
-class RegexMatch(object):
+class RegexMatch(object):  # pylint: disable=too-few-public-methods
     def __init__(self, msg):
         self.msg = msg
 
     def __eq__(self, other):
         match = re.search(self.msg, other)
-        if match:
-            return True
-        return False
+        return match is not None
 
 
 class CliEnvTesting(unittest.TestCase):
@@ -34,34 +32,35 @@ class CliEnvTesting(unittest.TestCase):
         self.cli_environ = cli_env.CliEnv()
 
     def _test_show_missing_env_var(self, var, *args):
+        # pylint: disable=unused-argument
         if var == 'INSTALLER_TYPE':
             CONST.__setattr__('INSTALLER_TYPE', None)
-            reg_string = "|  INSTALLER: Unknown, \S+\s*|"
+            reg_string = r"|  INSTALLER: Unknown, \S+\s*|"
         elif var == 'INSTALLER_IP':
             CONST.__setattr__('INSTALLER_IP', None)
-            reg_string = "|  INSTALLER: \S+, Unknown\s*|"
+            reg_string = r"|  INSTALLER: \S+, Unknown\s*|"
         elif var == 'SCENARIO':
             CONST.__setattr__('DEPLOY_SCENARIO', None)
-            reg_string = "|   SCENARIO: Unknown\s*|"
+            reg_string = r"|   SCENARIO: Unknown\s*|"
         elif var == 'NODE':
             CONST.__setattr__('NODE_NAME', None)
-            reg_string = "|        POD: Unknown\s*|"
+            reg_string = r"|        POD: Unknown\s*|"
         elif var == 'BUILD_TAG':
             CONST.__setattr__('BUILD_TAG', None)
-            reg_string = "|  BUILD TAG: None|"
+            reg_string = r"|  BUILD TAG: None|"
         elif var == 'DEBUG':
             CONST.__setattr__('CI_DEBUG', None)
-            reg_string = "| DEBUG FLAG: false\s*|"
+            reg_string = r"| DEBUG FLAG: false\s*|"
 
         with mock.patch('functest.cli.commands.cli_env.click.echo') \
                 as mock_click_echo:
             self.cli_environ.show()
             mock_click_echo.assert_called_with(RegexMatch(reg_string))
 
-    def test_show_missing_ci_installer_type(self, *args):
+    def test_show_ci_installer_type_ko(self, *args):
         self._test_show_missing_env_var('INSTALLER_TYPE', *args)
 
-    def test_show_missing_ci_installer_ip(self, *args):
+    def test_show_ci_installer_ip_ko(self, *args):
         self._test_show_missing_env_var('INSTALLER_IP', *args)
 
     def test_show_missing_ci_scenario(self, *args):