Merge "Fix pylint errors/warnings in tempest modules"

2 files changed, 56 insertions, 47 deletions

diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index 1c168032..c31ea0ab 100644
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@ -5,7 +5,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
-# pylint: disable=missing-docstring
+# pylint: disable=invalid-name,missing-docstring
 
 import logging
 import unittest
@@ -18,7 +18,7 @@ from snaps.openstack.os_credentials import OSCreds
 
 
 class OSTempestConfUtilsTesting(unittest.TestCase):
-
+    # pylint: disable=too-many-public-methods
     def setUp(self):
         self.os_creds = OSCreds(
             username='user', password='pass',
@@ -33,6 +33,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
     @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
                 return_value=mock.Mock())
     def test_create_tempest_resources_missing_network_dic(self, *mock_args):
+        # pylint: disable=unused-argument
         tempest_resources = tempest.TempestResourcesManager(
             os_creds=self.os_creds)
         with self.assertRaises(Exception) as context:
@@ -49,6 +50,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
     @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
                 return_value=None)
     def test_create_tempest_resources_missing_image(self, *mock_args):
+        # pylint: disable=unused-argument
         tempest_resources = tempest.TempestResourcesManager(
             os_creds=self.os_creds)
 
@@ -68,6 +70,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
     @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
                 return_value=None)
     def test_create_tempest_resources_missing_flavor(self, *mock_args):
+        # pylint: disable=unused-argument
         tempest_resources = tempest.TempestResourcesManager(
             os_creds=self.os_creds)
 
@@ -83,11 +86,12 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
         msg = 'Failed to create flavor'
         self.assertTrue(msg in context.exception, msg=str(context.exception))
 
+    @staticmethod
     @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils'
-                '.logger.info')
+                '.LOGGER.info')
     @mock.patch('functest.utils.functest_utils.execute_command_raise')
     @mock.patch('functest.utils.functest_utils.execute_command')
-    def test_create_rally_deployment(self, mock_exec, mock_exec_raise,
+    def test_create_rally_deployment(mock_exec, mock_exec_raise,
                                      mock_logger_info):
 
         conf_utils.create_rally_deployment()
@@ -109,7 +113,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
         mock_exec_raise.assert_any_call(cmd, error_msg=error_msg)
 
     @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils'
-                '.logger.debug')
+                '.LOGGER.debug')
     def test_create_verifier(self, mock_logger_debug):
         mock_popen = mock.Mock()
         attrs = {'poll.return_value': None,
@@ -129,6 +133,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
                 'create_rally_deployment', return_value=mock.Mock())
     def test_get_verifier_id_missing_verifier(self, mock_rally, mock_tempest):
+        # pylint: disable=unused-argument
         CONST.__setattr__('tempest_verifier_name', 'test_verifier_name')
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.subprocess.Popen') as mock_popen, \
@@ -144,6 +149,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
                 'create_rally_deployment', return_value=mock.Mock())
     def test_get_verifier_id_default(self, mock_rally, mock_tempest):
+        # pylint: disable=unused-argument
         CONST.__setattr__('tempest_verifier_name', 'test_verifier_name')
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.subprocess.Popen') as mock_popen:
@@ -164,7 +170,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             attrs = {'stdout.readline.return_value': ''}
             mock_stdout.configure_mock(**attrs)
             mock_popen.return_value = mock_stdout
-            conf_utils.get_verifier_deployment_id(),
+            conf_utils.get_verifier_deployment_id()
 
     def test_get_verifier_deployment_id_default(self):
         CONST.__setattr__('tempest_verifier_name', 'test_deploy_name')
@@ -292,27 +298,24 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertTrue(mwrite.called)
 
     def test_configure_tempest_update_params_missing_image_id(self):
-            self._test_missing_param(('compute', 'image_ref',
-                                      'test_image_id'), 'test_image_id',
-                                     None)
+        self._test_missing_param(('compute', 'image_ref', 'test_image_id'),
+                                 'test_image_id', None)
 
     def test_configure_tempest_update_params_missing_image_id_alt(self):
-            conf_utils.IMAGE_ID_ALT = 'test_image_id_alt'
-            self._test_missing_param(('compute', 'image_ref_alt',
-                                      'test_image_id_alt'), None, None)
+        conf_utils.IMAGE_ID_ALT = 'test_image_id_alt'
+        self._test_missing_param(('compute', 'image_ref_alt',
+                                  'test_image_id_alt'), None, None)
 
     def test_configure_tempest_update_params_missing_flavor_id(self):
-            CONST.__setattr__('tempest_use_custom_flavors', 'True')
-            self._test_missing_param(('compute', 'flavor_ref',
-                                      'test_flavor_id'), None,
-                                     'test_flavor_id')
+        CONST.__setattr__('tempest_use_custom_flavors', 'True')
+        self._test_missing_param(('compute', 'flavor_ref', 'test_flavor_id'),
+                                 None, 'test_flavor_id')
 
     def test_configure_tempest_update_params_missing_flavor_id_alt(self):
-            CONST.__setattr__('tempest_use_custom_flavors', 'True')
-            conf_utils.FLAVOR_ID_ALT = 'test_flavor_id_alt'
-            self._test_missing_param(('compute', 'flavor_ref_alt',
-                                      'test_flavor_id_alt'), None,
-                                     None)
+        CONST.__setattr__('tempest_use_custom_flavors', 'True')
+        conf_utils.FLAVOR_ID_ALT = 'test_flavor_id_alt'
+        self._test_missing_param(('compute', 'flavor_ref_alt',
+                                  'test_flavor_id_alt'), None, None)
 
     def test_configure_verifier_missing_temp_conf_file(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 37b61f3b..26f2e8ad 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -5,7 +5,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 
-# pylint: disable=missing-docstring
+# pylint: disable=invalid-name,missing-docstring
 
 import logging
 import unittest
@@ -49,20 +49,22 @@ class OSTempestTesting(unittest.TestCase):
             self.tempestcustom = tempest.TempestCustom()
             self.tempestdefcore = tempest.TempestDefcore()
 
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.logger.debug')
+    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug')
     def test_generate_test_list_defcore_mode(self, mock_logger_debug):
-        self.tempestcommon.MODE = 'defcore'
+        # pylint: disable=unused-argument
+        self.tempestcommon.mode = 'defcore'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'shutil.copyfile') as m:
+                        'shutil.copyfile') as mock_copyfile:
             self.tempestcommon.generate_test_list('test_verifier_repo_dir')
-            self.assertTrue(m.called)
+            self.assertTrue(mock_copyfile.called)
 
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.logger.error')
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.logger.debug')
+    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.error')
+    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug')
     def test_generate_test_list_custom_mode_missing_file(self,
                                                          mock_logger_debug,
                                                          mock_logger_error):
-        self.tempestcommon.MODE = 'custom'
+        # pylint: disable=unused-argument
+        self.tempestcommon.mode = 'custom'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                         'os.path.isfile', return_value=False), \
                 self.assertRaises(Exception) as context:
@@ -71,33 +73,32 @@ class OSTempestTesting(unittest.TestCase):
             self.assertTrue((msg % conf_utils.TEMPEST_CUSTOM) in context)
 
     def test_generate_test_list_custom_mode_default(self):
-        self.tempestcommon.MODE = 'custom'
+        self.tempestcommon.mode = 'custom'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'shutil.copyfile') as m, \
+                        'shutil.copyfile') as mock_copyfile, \
             mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                        'os.path.isfile', return_value=True):
             self.tempestcommon.generate_test_list('test_verifier_repo_dir')
-            self.assertTrue(m.called)
+            self.assertTrue(mock_copyfile.called)
 
     def _test_generate_test_list_mode_default(self, mode):
-        self.tempestcommon.MODE = mode
-        if self.tempestcommon.MODE == 'smoke':
+        self.tempestcommon.mode = mode
+        if self.tempestcommon.mode == 'smoke':
             testr_mode = "smoke"
-        elif self.tempestcommon.MODE == 'full':
+        elif self.tempestcommon.mode == 'full':
             testr_mode = ""
         else:
-            testr_mode = 'tempest.api.' + self.tempestcommon.MODE
+            testr_mode = 'tempest.api.' + self.tempestcommon.mode
         conf_utils.TEMPEST_RAW_LIST = 'raw_list'
         verifier_repo_dir = 'test_verifier_repo_dir'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
-                        'ft_utils.execute_command') as m:
+                        'ft_utils.execute_command') as mock_exec:
             cmd = ("cd {0};"
                    "testr list-tests {1} > {2};"
-                   "cd -;".format(verifier_repo_dir,
-                                  testr_mode,
+                   "cd -;".format(verifier_repo_dir, testr_mode,
                                   conf_utils.TEMPEST_RAW_LIST))
             self.tempestcommon.generate_test_list('test_verifier_repo_dir')
-            m.assert_any_call(cmd)
+            mock_exec.assert_any_call(cmd)
 
     def test_generate_test_list_smoke_mode(self):
         self._test_generate_test_list_mode_default('smoke')
@@ -106,7 +107,7 @@ class OSTempestTesting(unittest.TestCase):
         self._test_generate_test_list_mode_default('full')
 
     def test_parse_verifier_result_missing_verification_uuid(self):
-        self.tempestcommon.VERIFICATION_ID = None
+        self.tempestcommon.verification_id = None
         with self.assertRaises(Exception):
             self.tempestcommon.parse_verifier_result()
 
@@ -138,10 +139,10 @@ class OSTempestTesting(unittest.TestCase):
             obj.write.assert_any_call('test1\n')
             self.assertFalse(obj.write.assert_any_call('test2\n'))
 
-    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.logger.info')
+    @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.info')
     def test_run_verifier_tests_default(self, mock_logger_info):
         with mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch('__builtin__.iter', return_value=['\} tempest\.']), \
+            mock.patch('__builtin__.iter', return_value=[r'\} tempest\.']), \
             mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                        'subprocess.Popen'):
             conf_utils.TEMPEST_LIST = 'test_tempest_list'
@@ -149,13 +150,14 @@ class OSTempestTesting(unittest.TestCase):
                    conf_utils.TEMPEST_LIST]
             self.tempestcommon.run_verifier_tests()
             mock_logger_info. \
-                assert_any_call("Starting Tempest test suite: '%s'." % cmd)
+                assert_any_call("Starting Tempest test suite: '%s'.", cmd)
 
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'os.path.exists', return_value=False)
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs',
                 side_effect=Exception)
     def test_run_makedirs_ko(self, *args):
+        # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
                          testcase.TestCase.EX_RUN_ERROR)
 
@@ -165,6 +167,7 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'TempestResourcesManager.create', side_effect=Exception)
     def test_run_tempest_create_resources_ko(self, *args):
+        # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
                          testcase.TestCase.EX_RUN_ERROR)
 
@@ -176,6 +179,7 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
                 'get_active_compute_cnt', side_effect=Exception)
     def test_run_get_active_compute_cnt_ko(self, *args):
+        # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
                          testcase.TestCase.EX_RUN_ERROR)
 
@@ -189,6 +193,7 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'conf_utils.configure_tempest', side_effect=Exception)
     def test_run_configure_tempest_ko(self, *args):
+        # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
                          testcase.TestCase.EX_RUN_ERROR)
 
@@ -202,6 +207,7 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'conf_utils.configure_tempest')
     def _test_run(self, status, *args):
+        # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(), status)
 
     def test_run_missing_generate_test_list(self):
@@ -216,7 +222,7 @@ class OSTempestTesting(unittest.TestCase):
                                       side_effect=Exception()):
             self._test_run(testcase.TestCase.EX_RUN_ERROR)
 
-    def test_run_verifier_tests_ko(self, *args):
+    def test_run_verifier_tests_ko(self):
         with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
                 mock.patch.object(self.tempestcommon,
                                   'apply_tempest_blacklist'), \
@@ -226,7 +232,7 @@ class OSTempestTesting(unittest.TestCase):
                                   side_effect=Exception):
             self._test_run(testcase.TestCase.EX_RUN_ERROR)
 
-    def test_run_parse_verifier_result_ko(self, *args):
+    def test_run_parse_verifier_result_ko(self):
         with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
                 mock.patch.object(self.tempestcommon,
                                   'apply_tempest_blacklist'), \
@@ -235,7 +241,7 @@ class OSTempestTesting(unittest.TestCase):
                                   side_effect=Exception):
             self._test_run(testcase.TestCase.EX_RUN_ERROR)
 
-    def test_run(self, *args):
+    def test_run(self):
         with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
                 mock.patch.object(self.tempestcommon,
                                   'apply_tempest_blacklist'), \