Use decorators for mock patching

Instead of using the `with` clause, mock patching is prepended to each
testing method as a decorator.

Change-Id: Ieb962d6fd0b9a6cdc649c44e39f69b543426dce9
Signed-off-by: Martin Kulhavy <martin.kulhavy@nokia.com>

1 files changed, 272 insertions, 281 deletions

diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py
index 32cc15134..05311c3ff 100644
--- a/functest/tests/unit/openstack/rally/test_rally.py
+++ b/functest/tests/unit/openstack/rally/test_rally.py
@@ -18,75 +18,73 @@ from functest.utils.constants import CONST
 
 
 class OSRallyTesting(unittest.TestCase):
-
-    def setUp(self):
-        self.nova_client = mock.Mock()
-        self.neutron_client = mock.Mock()
-        self.cinder_client = mock.Mock()
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os_utils.get_nova_client',
-                        return_value=self.nova_client), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.get_neutron_client',
-                       return_value=self.neutron_client), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.get_cinder_client',
-                       return_value=self.cinder_client):
-            self.rally_base = rally.RallyBase()
-            self.rally_base.network_dict['net_id'] = 'test_net_id'
-            self.polling_iter = 2
-
-    def test_build_task_args_missing_floating_network(self):
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'get_nova_client', return_value=mock.Mock())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'get_neutron_client', return_value=mock.Mock())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'get_cinder_client', return_value=mock.Mock())
+    def setUp(self, mock_func1, mock_func2, mock_func3):
+        self.rally_base = rally.RallyBase()
+        self.rally_base.network_dict['net_id'] = 'test_net_id'
+        self.polling_iter = 2
+        mock_func1.assert_called()
+        mock_func2.assert_called()
+        mock_func3.assert_called()
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'get_external_net', return_value=None)
+    def test_build_task_args_missing_floating_network(self, mock_func):
         CONST.__setattr__('OS_AUTH_URL', None)
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os_utils.get_external_net',
-                        return_value=None):
-            task_args = self.rally_base._build_task_args('test_file_name')
-            self.assertEqual(task_args['floating_network'], '')
+        task_args = self.rally_base._build_task_args('test_file_name')
+        self.assertEqual(task_args['floating_network'], '')
+        mock_func.assert_called()
 
-    def test_build_task_args_missing_net_id(self):
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'get_external_net', return_value='test_floating_network')
+    def test_build_task_args_missing_net_id(self, mock_func):
         CONST.__setattr__('OS_AUTH_URL', None)
         self.rally_base.network_dict['net_id'] = ''
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os_utils.get_external_net',
-                        return_value='test_floating_network'):
-            task_args = self.rally_base._build_task_args('test_file_name')
-            self.assertEqual(task_args['netid'], '')
+        task_args = self.rally_base._build_task_args('test_file_name')
+        self.assertEqual(task_args['netid'], '')
+        mock_func.assert_called()
 
-    def check_scenario_file(self, value):
+    @staticmethod
+    def check_scenario_file(value):
         yaml_file = 'opnfv-{}.yaml'.format('test_file_name')
         if yaml_file in value:
             return False
         return True
 
-    def test_prepare_test_list_missing_scenario_file(self):
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.path.exists',
-                        side_effect=self.check_scenario_file), \
-                self.assertRaises(Exception):
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists')
+    def test_prepare_test_list_missing_scenario_file(self, mock_func):
+        mock_func.side_effect = self.check_scenario_file
+        with self.assertRaises(Exception):
             self.rally_base._prepare_test_list('test_file_name')
+        mock_func.assert_called()
 
-    def check_temp_dir(self, value):
+    @staticmethod
+    def check_temp_dir(value):
         yaml_file = 'opnfv-{}.yaml'.format('test_file_name')
         if yaml_file in value:
             return True
         return False
 
-    def test_prepare_test_list_missing_temp_dir(self):
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.path.exists',
-                        side_effect=self.check_temp_dir), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os.makedirs') as mock_os_makedir, \
-            mock.patch.object(self.rally_base, 'apply_blacklist',
-                              return_value=mock.Mock()) as mock_method:
-            yaml_file = 'opnfv-{}.yaml'.format('test_file_name')
-            ret_val = os.path.join(self.rally_base.TEMP_DIR, yaml_file)
-            self.assertEqual(self.rally_base.
-                             _prepare_test_list('test_file_name'),
-                             ret_val)
-            self.assertTrue(mock_method.called)
-            self.assertTrue(mock_os_makedir.called)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.makedirs')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'apply_blacklist', return_value=mock.Mock())
+    def test_prepare_test_list_missing_temp_dir(
+            self, mock_method, mock_os_makedirs, mock_path_exists):
+        mock_path_exists.side_effect = self.check_temp_dir
+
+        yaml_file = 'opnfv-{}.yaml'.format('test_file_name')
+        ret_val = os.path.join(self.rally_base.TEMP_DIR, yaml_file)
+        self.assertEqual(self.rally_base._prepare_test_list('test_file_name'),
+                         ret_val)
+        mock_path_exists.assert_called()
+        mock_method.assert_called()
+        mock_os_makedirs.assert_called()
 
     def test_get_task_id_default(self):
         cmd_raw = 'Task 1: started'
@@ -125,170 +123,163 @@ class OSRallyTesting(unittest.TestCase):
         self.assertEqual(self.rally_base.get_cmd_output(proc),
                          'lineline')
 
-    def test_excl_scenario_default(self):
+    @mock.patch('__builtin__.open', mock.mock_open())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
+                return_value={'scenario': [
+                    {'scenarios': ['test_scenario'],
+                     'installers': ['test_installer'],
+                     'tests': ['test']},
+                    {'scenarios': ['other_scenario'],
+                     'installers': ['test_installer'],
+                     'tests': ['other_test']}]})
+    def test_excl_scenario_default(self, mock_func):
         CONST.__setattr__('INSTALLER_TYPE', 'test_installer')
         CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario')
-        dic = {'scenario': [{'scenarios': ['test_scenario'],
-                             'installers': ['test_installer'],
-                             'tests': ['test']},
-                            {'scenarios': ['other_scenario'],
-                             'installers': ['test_installer'],
-                             'tests': ['other_test']}]}
-        with mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'yaml.safe_load',
-                       return_value=dic):
-                self.assertEqual(self.rally_base.excl_scenario(),
-                                 ['test'])
-
-    def test_excl_scenario_regex(self):
+        self.assertEqual(self.rally_base.excl_scenario(), ['test'])
+        mock_func.assert_called()
+
+    @mock.patch('__builtin__.open', mock.mock_open())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
+                return_value={'scenario': [
+                    {'scenarios': ['^os-[^-]+-featT-modeT$'],
+                     'installers': ['test_installer'],
+                     'tests': ['test1']},
+                    {'scenarios': ['^os-ctrlT-[^-]+-modeT$'],
+                     'installers': ['test_installer'],
+                     'tests': ['test2']},
+                    {'scenarios': ['^os-ctrlT-featT-[^-]+$'],
+                     'installers': ['test_installer'],
+                     'tests': ['test3']},
+                    {'scenarios': ['^os-'],
+                     'installers': ['test_installer'],
+                     'tests': ['test4']},
+                    {'scenarios': ['other_scenario'],
+                     'installers': ['test_installer'],
+                     'tests': ['test0a']},
+                    {'scenarios': [''],  # empty scenario
+                     'installers': ['test_installer'],
+                     'tests': ['test0b']}]})
+    def test_excl_scenario_regex(self, mock_func):
         CONST.__setattr__('INSTALLER_TYPE', 'test_installer')
         CONST.__setattr__('DEPLOY_SCENARIO', 'os-ctrlT-featT-modeT')
-        dic = {'scenario': [{'scenarios': ['^os-[^-]+-featT-modeT$'],
-                             'installers': ['test_installer'],
-                             'tests': ['test1']},
-                            {'scenarios': ['^os-ctrlT-[^-]+-modeT$'],
-                             'installers': ['test_installer'],
-                             'tests': ['test2']},
-                            {'scenarios': ['^os-ctrlT-featT-[^-]+$'],
-                             'installers': ['test_installer'],
-                             'tests': ['test3']},
-                            {'scenarios': ['^os-'],
-                             'installers': ['test_installer'],
-                             'tests': ['test4']},
-                            {'scenarios': ['other_scenario'],
-                             'installers': ['test_installer'],
-                             'tests': ['test0a']},
-                            {'scenarios': [''],  # empty scenario
-                             'installers': ['test_installer'],
-                             'tests': ['test0b']}]}
-        with mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'yaml.safe_load',
-                       return_value=dic):
-            self.assertEqual(self.rally_base.excl_scenario(),
-                             ['test1', 'test2', 'test3', 'test4'])
-
-    def test_excl_scenario_exception(self):
-        with mock.patch('__builtin__.open', side_effect=Exception):
-                self.assertEqual(self.rally_base.excl_scenario(),
-                                 [])
-
-    def test_excl_func_default(self):
+        self.assertEqual(self.rally_base.excl_scenario(),
+                         ['test1', 'test2', 'test3', 'test4'])
+        mock_func.assert_called()
+
+    @mock.patch('__builtin__.open', side_effect=Exception)
+    def test_excl_scenario_exception(self, mock_open):
+        self.assertEqual(self.rally_base.excl_scenario(), [])
+        mock_open.assert_called()
+
+    @mock.patch('__builtin__.open', mock.mock_open())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.yaml.safe_load',
+                return_value={'functionality': [
+                    {'functions': ['no_live_migration'], 'tests': ['test']}]})
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'live_migration_supported', return_value=False)
+    def test_excl_func_default(self, mock_func, mock_yaml_load):
         CONST.__setattr__('INSTALLER_TYPE', 'test_installer')
         CONST.__setattr__('DEPLOY_SCENARIO', 'test_scenario')
-        dic = {'functionality': [{'functions': ['no_live_migration'],
-                                  'tests': ['test']}]}
-        with mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'yaml.safe_load',
-                       return_value=dic), \
-            mock.patch.object(self.rally_base, 'live_migration_supported',
-                              return_value=False):
-                self.assertEqual(self.rally_base.excl_func(),
-                                 ['test'])
-
-    def test_excl_func_exception(self):
-        with mock.patch('__builtin__.open', side_effect=Exception):
-                self.assertEqual(self.rally_base.excl_func(),
-                                 [])
-
-    def test_file_is_empty_default(self):
-        mock_obj = mock.Mock()
+        self.assertEqual(self.rally_base.excl_func(), ['test'])
+        mock_func.assert_called()
+        mock_yaml_load.assert_called()
+
+    @mock.patch('__builtin__.open', side_effect=Exception)
+    def test_excl_func_exception(self, mock_open):
+        self.assertEqual(self.rally_base.excl_func(), [])
+        mock_open.assert_called()
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.stat',
+                return_value=mock.Mock())
+    def test_file_is_empty_default(self, mock_os_stat):
         attrs = {'st_size': 10}
-        mock_obj.configure_mock(**attrs)
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.stat',
-                        return_value=mock_obj):
-            self.assertEqual(self.rally_base.file_is_empty('test_file_name'),
-                             False)
-
-    def test_file_is_empty_exception(self):
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.stat',
-                        side_effect=Exception):
-            self.assertEqual(self.rally_base.file_is_empty('test_file_name'),
-                             True)
-
-    def test_run_task_missing_task_file(self):
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.path.exists',
-                        return_value=False), \
-                self.assertRaises(Exception):
-            self.rally_base._run_task('test_name')
+        mock_os_stat.return_value.configure_mock(**attrs)
+        self.assertEqual(self.rally_base.file_is_empty('test_file_name'),
+                         False)
+        mock_os_stat.assert_called()
 
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.info')
-    def test_run_task_no_tests_for_scenario(self, mock_logger_info):
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.path.exists',
-                        return_value=True), \
-            mock.patch.object(self.rally_base, '_prepare_test_list',
-                              return_value='test_file_name'), \
-            mock.patch.object(self.rally_base, 'file_is_empty',
-                              return_value=True):
-            self.rally_base._run_task('test_name')
-            mock_logger_info.assert_any_call('No tests for scenario \"%s\"',
-                                             'test_name')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.stat',
+                side_effect=Exception)
+    def test_file_is_empty_exception(self, mock_os_stat):
+        self.assertEqual(self.rally_base.file_is_empty('test_file_name'), True)
+        mock_os_stat.assert_called()
 
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.error')
-    def test_run_task_taskid_missing(self, mock_logger_error):
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.path.exists',
-                        return_value=True), \
-            mock.patch.object(self.rally_base, '_prepare_test_list',
-                              return_value='test_file_name'), \
-            mock.patch.object(self.rally_base, 'file_is_empty',
-                              return_value=False), \
-            mock.patch.object(self.rally_base, '_build_task_args',
-                              return_value={}), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'subprocess.Popen'), \
-            mock.patch.object(self.rally_base, '_get_output',
-                              return_value=mock.Mock()), \
-            mock.patch.object(self.rally_base, 'get_task_id',
-                              return_value=None), \
-            mock.patch.object(self.rally_base, 'get_cmd_output',
-                              return_value=''):
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
+                return_value=False)
+    def test_run_task_missing_task_file(self, mock_path_exists):
+        with self.assertRaises(Exception):
             self.rally_base._run_task('test_name')
-            str = 'Failed to retrieve task_id, validating task...'
-            mock_logger_error.assert_any_call(str)
-
+        mock_path_exists.assert_called()
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
+                return_value=True)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_prepare_test_list', return_value='test_file_name')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'file_is_empty', return_value=True)
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.info')
+    def test_run_task_no_tests_for_scenario(self, mock_logger_info,
+                                            mock_file_empty, mock_prep_list,
+                                            mock_path_exists):
+        self.rally_base._run_task('test_name')
+        mock_logger_info.assert_any_call('No tests for scenario \"%s\"',
+                                         'test_name')
+        mock_file_empty.assert_called()
+        mock_prep_list.assert_called()
+        mock_path_exists.assert_called()
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_prepare_test_list', return_value='test_file_name')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'file_is_empty', return_value=False)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_build_task_args', return_value={})
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_get_output', return_value=mock.Mock())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'get_task_id', return_value=None)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'get_cmd_output', return_value='')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
+                return_value=True)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.subprocess.Popen')
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.error')
-    def test_run_task_default(self, mock_logger_error,
-                              mock_logger_info):
-        popen = mock.Mock()
+    def test_run_task_taskid_missing(self, mock_logger_error, *args):
+        self.rally_base._run_task('test_name')
+        text = 'Failed to retrieve task_id, validating task...'
+        mock_logger_error.assert_any_call(text)
+
+    @mock.patch('__builtin__.open', mock.mock_open())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_prepare_test_list', return_value='test_file_name')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'file_is_empty', return_value=False)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_build_task_args', return_value={})
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_get_output', return_value=mock.Mock())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'get_task_id', return_value='1')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'get_cmd_output', return_value='')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                'task_succeed', return_value=True)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.path.exists',
+                return_value=True)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.subprocess.Popen')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.makedirs')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.popen',
+                return_value=mock.Mock())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.info')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.LOGGER.error')
+    def test_run_task_default(self, mock_logger_error, mock_logger_info,
+                              mock_popen, *args):
         attrs = {'read.return_value': 'json_result'}
-        popen.configure_mock(**attrs)
-
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os.path.exists',
-                        return_value=True), \
-            mock.patch.object(self.rally_base, '_prepare_test_list',
-                              return_value='test_file_name'), \
-            mock.patch.object(self.rally_base, 'file_is_empty',
-                              return_value=False), \
-            mock.patch.object(self.rally_base, '_build_task_args',
-                              return_value={}), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'subprocess.Popen'), \
-            mock.patch.object(self.rally_base, '_get_output',
-                              return_value=mock.Mock()), \
-            mock.patch.object(self.rally_base, 'get_task_id',
-                              return_value='1'), \
-            mock.patch.object(self.rally_base, 'get_cmd_output',
-                              return_value=''), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os.makedirs'), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os.popen',
-                       return_value=popen), \
-            mock.patch('__builtin__.open', mock.mock_open()), \
-            mock.patch.object(self.rally_base, 'task_succeed',
-                              return_value=True):
-            self.rally_base._run_task('test_name')
-            str = 'Test scenario: "test_name" OK.\n'
-            mock_logger_info.assert_any_call(str)
+        mock_popen.return_value.configure_mock(**attrs)
+        self.rally_base._run_task('test_name')
+        text = 'Test scenario: "test_name" OK.\n'
+        mock_logger_info.assert_any_call(text)
+        mock_logger_error.assert_not_called()
 
     def test_prepare_env_testname_invalid(self):
         self.rally_base.TESTS = ['test1', 'test2']
@@ -296,103 +287,103 @@ class OSRallyTesting(unittest.TestCase):
         with self.assertRaises(Exception):
             self.rally_base._prepare_env()
 
-    def test_prepare_env_volume_creation_failed(self):
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'list_volume_types', return_value=None)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'create_volume_type', return_value=None)
+    def test_prepare_env_volume_creation_failed(self, mock_list, mock_create):
         self.rally_base.TESTS = ['test1', 'test2']
         self.rally_base.test_name = 'test1'
-        volume_type = None
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os_utils.list_volume_types',
-                        return_value=None), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.create_volume_type',
-                       return_value=volume_type), \
-                self.assertRaises(Exception):
+        with self.assertRaises(Exception):
             self.rally_base._prepare_env()
-
-    def test_prepare_env_image_missing(self):
+        mock_list.assert_called()
+        mock_create.assert_called()
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'list_volume_types', return_value=None)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'create_volume_type', return_value=mock.Mock())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'get_or_create_image', return_value=(True, None))
+    def test_prepare_env_image_missing(self, mock_get_img, mock_create_vt,
+                                       mock_list_vt):
         self.rally_base.TESTS = ['test1', 'test2']
         self.rally_base.test_name = 'test1'
-        volume_type = mock.Mock()
-        image_id = None
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os_utils.list_volume_types',
-                        return_value=None), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.create_volume_type',
-                       return_value=volume_type), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.get_or_create_image',
-                       return_value=(True, image_id)), \
-                self.assertRaises(Exception):
+        with self.assertRaises(Exception):
             self.rally_base._prepare_env()
-
-    def test_prepare_env_image_shared_network_creation_failed(self):
+        mock_get_img.assert_called()
+        mock_create_vt.assert_called()
+        mock_list_vt.assert_called()
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'list_volume_types', return_value=None)
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'create_volume_type', return_value=mock.Mock())
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'get_or_create_image', return_value=(True, 'image_id'))
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'create_shared_network_full', return_value=None)
+    def test_prepare_env_image_shared_network_creation_failed(
+            self, mock_create_net, mock_get_img, mock_create_vt, mock_list_vt):
         self.rally_base.TESTS = ['test1', 'test2']
         self.rally_base.test_name = 'test1'
-        volume_type = mock.Mock()
-        image_id = 'image_id'
-        network_dict = None
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os_utils.list_volume_types',
-                        return_value=None), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.create_volume_type',
-                       return_value=volume_type), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.get_or_create_image',
-                       return_value=(True, image_id)), \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.create_shared_network_full',
-                       return_value=network_dict), \
-                self.assertRaises(Exception):
+        with self.assertRaises(Exception):
             self.rally_base._prepare_env()
-
-    def test_run_tests_all(self):
+        mock_create_net.assert_called()
+        mock_get_img.assert_called()
+        mock_create_vt.assert_called()
+        mock_list_vt.assert_called()
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_run_task', return_value=mock.Mock())
+    def test_run_tests_all(self, mock_run_task):
         self.rally_base.TESTS = ['test1', 'test2']
         self.rally_base.test_name = 'all'
-        with mock.patch.object(self.rally_base, '_run_task',
-                               return_value=mock.Mock()):
-            self.rally_base._run_tests()
-            self.rally_base._run_task.assert_any_call('test1')
-            self.rally_base._run_task.assert_any_call('test2')
+        self.rally_base._run_tests()
+        mock_run_task.assert_any_call('test1')
+        mock_run_task.assert_any_call('test2')
 
-    def test_run_tests_default(self):
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_run_task', return_value=mock.Mock())
+    def test_run_tests_default(self, mock_run_task):
         self.rally_base.TESTS = ['test1', 'test2']
         self.rally_base.test_name = 'test1'
-        with mock.patch.object(self.rally_base, '_run_task',
-                               return_value=mock.Mock()):
-            self.rally_base._run_tests()
-            self.rally_base._run_task.assert_any_call('test1')
-
-    def test_clean_up_default(self):
+        self.rally_base._run_tests()
+        mock_run_task.assert_any_call('test1')
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'delete_volume_type')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
+                'delete_glance_image')
+    def test_clean_up_default(self, mock_glance_method, mock_vol_method):
         self.rally_base.volume_type = mock.Mock()
         self.rally_base.cinder_client = mock.Mock()
         self.rally_base.image_exists = False
         self.rally_base.image_id = 1
         self.rally_base.nova_client = mock.Mock()
-        with mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                        'os_utils.delete_volume_type') as mock_vol_method, \
-            mock.patch('functest.opnfv_tests.openstack.rally.rally.'
-                       'os_utils.delete_glance_image') as mock_glance_method:
-            self.rally_base._clean_up()
-            mock_vol_method.assert_any_call(self.rally_base.cinder_client,
-                                            self.rally_base.volume_type)
-            mock_glance_method.assert_any_call(self.rally_base.nova_client,
-                                               1)
-
-    def test_run_default(self):
-        with mock.patch.object(self.rally_base, '_prepare_env'), \
-            mock.patch.object(self.rally_base, '_run_tests'), \
-            mock.patch.object(self.rally_base, '_generate_report'), \
-                mock.patch.object(self.rally_base, '_clean_up'):
-            self.assertEqual(self.rally_base.run(),
-                             testcase.TestCase.EX_OK)
-
-    def test_run_exception(self):
-        with mock.patch.object(self.rally_base, '_prepare_env',
-                               side_effect=Exception):
-            self.assertEqual(self.rally_base.run(),
-                             testcase.TestCase.EX_RUN_ERROR)
+        self.rally_base._clean_up()
+        mock_vol_method.assert_any_call(self.rally_base.cinder_client,
+                                        self.rally_base.volume_type)
+        mock_glance_method.assert_any_call(self.rally_base.nova_client,
+                                           1)
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_prepare_env')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_run_tests')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_generate_report')
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_clean_up')
+    def test_run_default(self, *args):
+        self.assertEqual(self.rally_base.run(), testcase.TestCase.EX_OK)
+        map(lambda m: m.assert_called(), args)
+
+    @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
+                '_prepare_env', side_effect=Exception)
+    def test_run_exception(self, mock_prep_env):
+        self.assertEqual(self.rally_base.run(), testcase.TestCase.EX_RUN_ERROR)
+        mock_prep_env.assert_called()
 
 
 if __name__ == "__main__":