Merge "Enable invalid-name warnings in tempest modules"

2 files changed, 56 insertions, 55 deletions

diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index c31ea0ab..5fed742c 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=invalid-name,missing-docstring
+# pylint: disable=missing-docstring
 
 import logging
 import unittest
@@ -32,7 +32,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
                 return_value=None)
     @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
                 return_value=mock.Mock())
-    def test_create_tempest_resources_missing_network_dic(self, *mock_args):
+    def test_create_res_missing_net_dic(self, *mock_args):
         # pylint: disable=unused-argument
         tempest_resources = tempest.TempestResourcesManager(
             os_creds=self.os_creds)
@@ -49,7 +49,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
                 return_value=mock.Mock())
     @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
                 return_value=None)
-    def test_create_tempest_resources_missing_image(self, *mock_args):
+    def test_create_res_missing_image(self, *mock_args):
         # pylint: disable=unused-argument
         tempest_resources = tempest.TempestResourcesManager(
             os_creds=self.os_creds)
@@ -69,7 +69,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
                 return_value=mock.Mock())
     @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
                 return_value=None)
-    def test_create_tempest_resources_missing_flavor(self, *mock_args):
+    def test_create_res_missing_flavor(self, *mock_args):
         # pylint: disable=unused-argument
         tempest_resources = tempest.TempestResourcesManager(
             os_creds=self.os_creds)
@@ -132,7 +132,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
                 'create_verifier', return_value=mock.Mock())
     @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):
+    def test_get_verif_id_missing_verif(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.'
@@ -161,7 +161,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertEqual(conf_utils.get_verifier_id(),
                              'test_deploy_id')
 
-    def test_get_verifier_deployment_id_missing_rally(self):
+    def test_get_depl_id_missing_rally(self):
         CONST.__setattr__('tempest_verifier_name', 'test_deploy_name')
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.subprocess.Popen') as mock_popen, \
@@ -172,7 +172,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             mock_popen.return_value = mock_stdout
             conf_utils.get_verifier_deployment_id()
 
-    def test_get_verifier_deployment_id_default(self):
+    def test_get_depl_id_default(self):
         CONST.__setattr__('tempest_verifier_name', 'test_deploy_name')
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.subprocess.Popen') as mock_popen:
@@ -184,59 +184,61 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertEqual(conf_utils.get_verifier_deployment_id(),
                              'test_deploy_id')
 
-    def test_get_verifier_repo_dir_default(self):
+    def test_get_verif_repo_dir_default(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.os.path.join',
                         return_value='test_verifier_repo_dir'), \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.get_verifier_id') as m:
+                       'conf_utils.get_verifier_id') as mock_get_id:
             self.assertEqual(conf_utils.get_verifier_repo_dir(''),
                              'test_verifier_repo_dir')
-            self.assertTrue(m.called)
+            self.assertTrue(mock_get_id.called)
 
-    def test_get_verifier_deployment_dir_default(self):
+    def test_get_depl_dir_default(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.os.path.join',
                         return_value='test_verifier_repo_dir'), \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.get_verifier_id') as m1, \
+                       'conf_utils.get_verifier_id') as mock_get_vid, \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.get_verifier_deployment_id') as m2:
+                       'conf_utils.get_verifier_deployment_id') \
+                as mock_get_did:
             self.assertEqual(conf_utils.get_verifier_deployment_dir('', ''),
                              'test_verifier_repo_dir')
-            self.assertTrue(m1.called)
-            self.assertTrue(m2.called)
+            self.assertTrue(mock_get_vid.called)
+            self.assertTrue(mock_get_did.called)
 
-    def test_backup_tempest_config_default(self):
+    def test_backup_config_default(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.os.path.exists',
                         return_value=False), \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.os.makedirs') as m1, \
+                       'conf_utils.os.makedirs') as mock_makedirs, \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.shutil.copyfile') as m2:
+                       'conf_utils.shutil.copyfile') as mock_copyfile:
             conf_utils.backup_tempest_config('test_conf_file')
-            self.assertTrue(m1.called)
-            self.assertTrue(m2.called)
+            self.assertTrue(mock_makedirs.called)
+            self.assertTrue(mock_copyfile.called)
 
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.os.path.exists',
                         return_value=True), \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.shutil.copyfile') as m2:
+                       'conf_utils.shutil.copyfile') as mock_copyfile:
             conf_utils.backup_tempest_config('test_conf_file')
-            self.assertTrue(m2.called)
+            self.assertTrue(mock_copyfile.called)
 
-    def test_configure_tempest_default(self):
+    def test_conf_tempest_def(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.configure_verifier',
                         return_value='test_conf_file'), \
             mock.patch('functest.opnfv_tests.openstack.tempest.'
-                       'conf_utils.configure_tempest_update_params') as m1:
+                       'conf_utils.configure_tempest_update_params')\
+                as mock_upd:
             conf_utils.configure_tempest('test_dep_dir')
-            self.assertTrue(m1.called)
+            self.assertTrue(mock_upd.called)
 
-    def test_configure_tempest_defcore_default(self):
+    def test_conf_tempest_defcore_def(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.configure_verifier',
                         return_value='test_conf_file'), \
@@ -268,7 +270,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertTrue(mread.called)
             self.assertTrue(mwrite.called)
 
-    def test_generate_test_accounts_file_default(self):
+    def test_gen_test_accounts_file_def(self):
         with mock.patch("__builtin__.open", mock.mock_open()), \
             mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.'
                        'yaml.dump') as mock_dump:
@@ -297,27 +299,27 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertTrue(mread.called)
             self.assertTrue(mwrite.called)
 
-    def test_configure_tempest_update_params_missing_image_id(self):
+    def test_upd_missing_image_id(self):
         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):
+    def test_upd_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)
 
-    def test_configure_tempest_update_params_missing_flavor_id(self):
+    def test_upd_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')
 
-    def test_configure_tempest_update_params_missing_flavor_id_alt(self):
+    def test_upd_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)
 
-    def test_configure_verifier_missing_temp_conf_file(self):
+    def test_verif_missing_conf_file(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.os.path.isfile',
                         return_value=False), \
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 26f2e8ad..5d543ffc 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=invalid-name,missing-docstring
+# pylint: disable=missing-docstring
 
 import logging
 import unittest
@@ -50,7 +50,7 @@ class OSTempestTesting(unittest.TestCase):
             self.tempestdefcore = tempest.TempestDefcore()
 
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug')
-    def test_generate_test_list_defcore_mode(self, mock_logger_debug):
+    def test_gen_tl_defcore_mode(self, mock_logger_debug):
         # pylint: disable=unused-argument
         self.tempestcommon.mode = 'defcore'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
@@ -60,9 +60,8 @@ class OSTempestTesting(unittest.TestCase):
 
     @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):
+    def test_gen_tl_cm_missing_file(self, mock_logger_debug,
+                                    mock_logger_error):
         # pylint: disable=unused-argument
         self.tempestcommon.mode = 'custom'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
@@ -72,7 +71,7 @@ class OSTempestTesting(unittest.TestCase):
             self.tempestcommon.generate_test_list('test_verifier_repo_dir')
             self.assertTrue((msg % conf_utils.TEMPEST_CUSTOM) in context)
 
-    def test_generate_test_list_custom_mode_default(self):
+    def test_gen_tl_cm_default(self):
         self.tempestcommon.mode = 'custom'
         with mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                         'shutil.copyfile') as mock_copyfile, \
@@ -81,7 +80,7 @@ class OSTempestTesting(unittest.TestCase):
             self.tempestcommon.generate_test_list('test_verifier_repo_dir')
             self.assertTrue(mock_copyfile.called)
 
-    def _test_generate_test_list_mode_default(self, mode):
+    def _test_gen_tl_mode_default(self, mode):
         self.tempestcommon.mode = mode
         if self.tempestcommon.mode == 'smoke':
             testr_mode = "smoke"
@@ -100,34 +99,34 @@ class OSTempestTesting(unittest.TestCase):
             self.tempestcommon.generate_test_list('test_verifier_repo_dir')
             mock_exec.assert_any_call(cmd)
 
-    def test_generate_test_list_smoke_mode(self):
-        self._test_generate_test_list_mode_default('smoke')
+    def test_gen_tl_smoke_mode(self):
+        self._test_gen_tl_mode_default('smoke')
 
-    def test_generate_test_list_full_mode(self):
-        self._test_generate_test_list_mode_default('full')
+    def test_gen_tl_full_mode(self):
+        self._test_gen_tl_mode_default('full')
 
-    def test_parse_verifier_result_missing_verification_uuid(self):
+    def test_verif_res_missing_verif_id(self):
         self.tempestcommon.verification_id = None
         with self.assertRaises(Exception):
             self.tempestcommon.parse_verifier_result()
 
-    def test_apply_tempest_blacklist_no_blacklist(self):
-        with mock.patch('__builtin__.open', mock.mock_open()) as m, \
+    def test_apply_missing_blacklist(self):
+        with mock.patch('__builtin__.open', mock.mock_open()) as mock_open, \
             mock.patch.object(self.tempestcommon, 'read_file',
                               return_value=['test1', 'test2']):
             conf_utils.TEMPEST_BLACKLIST = Exception
             CONST.__setattr__('INSTALLER_TYPE', 'installer_type')
             CONST.__setattr__('DEPLOY_SCENARIO', 'deploy_scenario')
             self.tempestcommon.apply_tempest_blacklist()
-            obj = m()
+            obj = mock_open()
             obj.write.assert_any_call('test1\n')
             obj.write.assert_any_call('test2\n')
 
-    def test_apply_tempest_blacklist_default(self):
+    def test_apply_blacklist_default(self):
         item_dict = {'scenarios': ['deploy_scenario'],
                      'installers': ['installer_type'],
                      'tests': ['test2']}
-        with mock.patch('__builtin__.open', mock.mock_open()) as m, \
+        with mock.patch('__builtin__.open', mock.mock_open()) as mock_open, \
             mock.patch.object(self.tempestcommon, 'read_file',
                               return_value=['test1', 'test2']), \
             mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
@@ -135,7 +134,7 @@ class OSTempestTesting(unittest.TestCase):
             CONST.__setattr__('INSTALLER_TYPE', 'installer_type')
             CONST.__setattr__('DEPLOY_SCENARIO', 'deploy_scenario')
             self.tempestcommon.apply_tempest_blacklist()
-            obj = m()
+            obj = mock_open()
             obj.write.assert_any_call('test1\n')
             self.assertFalse(obj.write.assert_any_call('test2\n'))
 
@@ -166,7 +165,7 @@ class OSTempestTesting(unittest.TestCase):
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.os.makedirs')
     @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.'
                 'TempestResourcesManager.create', side_effect=Exception)
-    def test_run_tempest_create_resources_ko(self, *args):
+    def test_run_create_resources_ko(self, *args):
         # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
                          testcase.TestCase.EX_RUN_ERROR)
@@ -178,7 +177,7 @@ class OSTempestTesting(unittest.TestCase):
                 'TempestResourcesManager.create', return_value={})
     @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):
+    def test_run_get_active_comp_cnt_ko(self, *args):
         # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(),
                          testcase.TestCase.EX_RUN_ERROR)
@@ -210,12 +209,12 @@ class OSTempestTesting(unittest.TestCase):
         # pylint: disable=unused-argument
         self.assertEqual(self.tempestcommon.run(), status)
 
-    def test_run_missing_generate_test_list(self):
+    def test_run_missing_gen_test_list(self):
         with mock.patch.object(self.tempestcommon, 'generate_test_list',
                                side_effect=Exception):
             self._test_run(testcase.TestCase.EX_RUN_ERROR)
 
-    def test_run_apply_tempest_blacklist_ko(self):
+    def test_run_apply_blacklist_ko(self):
         with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
                     mock.patch.object(self.tempestcommon,
                                       'apply_tempest_blacklist',
@@ -232,7 +231,7 @@ class OSTempestTesting(unittest.TestCase):
                                   side_effect=Exception):
             self._test_run(testcase.TestCase.EX_RUN_ERROR)
 
-    def test_run_parse_verifier_result_ko(self):
+    def test_run_verif_result_ko(self):
         with mock.patch.object(self.tempestcommon, 'generate_test_list'), \
                 mock.patch.object(self.tempestcommon,
                                   'apply_tempest_blacklist'), \