summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2017-09-21 11:23:42 +0300
committerMorgan Richomme <morgan.richomme@orange.com>2017-09-21 09:01:00 +0000
commitd684b8aa0aa0aaa600095b92b4203302b5a57972 (patch)
treed3dffd2d9d97e7fc81115761b875828d1f36a32f
parent77b1231c610a659ca6e782c9297b4a0d918eb97f (diff)
Remove void return value mocks in rally unit tests
Change-Id: I369b98fb9120830b1868f438c7da2a039a60d890 Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit 31524290992dad02d5ca1e6b17304bf31b56b7f7)
-rw-r--r--functest/tests/unit/openstack/rally/test_rally.py43
1 files changed, 16 insertions, 27 deletions
diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py
index 191722dc0..827d69d8f 100644
--- a/functest/tests/unit/openstack/rally/test_rally.py
+++ b/functest/tests/unit/openstack/rally/test_rally.py
@@ -66,7 +66,7 @@ class OSRallyTesting(unittest.TestCase):
@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())
+ 'apply_blacklist')
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
@@ -182,8 +182,7 @@ class OSRallyTesting(unittest.TestCase):
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())
+ @mock.patch('functest.opnfv_tests.openstack.rally.rally.os.stat')
def test_file_is_empty_default(self, mock_os_stat):
attrs = {'st_size': 10}
mock_os_stat.return_value.configure_mock(**attrs)
@@ -228,7 +227,7 @@ class OSRallyTesting(unittest.TestCase):
@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())
+ '_get_output')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
'get_task_id', return_value=None)
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
@@ -250,7 +249,7 @@ class OSRallyTesting(unittest.TestCase):
@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())
+ '_get_output')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
'get_task_id', return_value='1')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
@@ -261,8 +260,7 @@ class OSRallyTesting(unittest.TestCase):
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.os.popen')
@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,
@@ -294,8 +292,7 @@ class OSRallyTesting(unittest.TestCase):
@mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
'get_ext_net_name', return_value='test_net_name')
- @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
- return_value=mock.Mock())
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
@mock.patch('snaps.openstack.utils.deploy_utils.create_network',
return_value=None)
def test_prepare_env_network_creation_failed(
@@ -310,10 +307,8 @@ class OSRallyTesting(unittest.TestCase):
@mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
'get_ext_net_name', return_value='test_net_name')
- @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
- return_value=mock.Mock())
- @mock.patch('snaps.openstack.utils.deploy_utils.create_network',
- return_value=mock.Mock())
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_network')
@mock.patch('snaps.openstack.utils.deploy_utils.create_router',
return_value=None)
def test_prepare_env_router_creation_failed(
@@ -330,12 +325,9 @@ class OSRallyTesting(unittest.TestCase):
@mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
'get_ext_net_name', return_value='test_net_name')
- @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
- return_value=mock.Mock())
- @mock.patch('snaps.openstack.utils.deploy_utils.create_network',
- return_value=mock.Mock())
- @mock.patch('snaps.openstack.utils.deploy_utils.create_router',
- return_value=mock.Mock())
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_network')
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_router')
@mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
return_value=None)
def test_prepare_env_flavor_creation_failed(
@@ -353,12 +345,9 @@ class OSRallyTesting(unittest.TestCase):
@mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
'get_ext_net_name', return_value='test_net_name')
- @mock.patch('snaps.openstack.utils.deploy_utils.create_image',
- return_value=mock.Mock())
- @mock.patch('snaps.openstack.utils.deploy_utils.create_network',
- return_value=mock.Mock())
- @mock.patch('snaps.openstack.utils.deploy_utils.create_router',
- return_value=mock.Mock())
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_image')
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_network')
+ @mock.patch('snaps.openstack.utils.deploy_utils.create_router')
@mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
side_effect=[mock.Mock, None])
def test_prepare_env_flavor_alt_creation_failed(
@@ -375,7 +364,7 @@ class OSRallyTesting(unittest.TestCase):
self.assertEqual(mock_create_flavor.call_count, 2)
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
- '_run_task', return_value=mock.Mock())
+ '_run_task')
def test_run_tests_all(self, mock_run_task):
self.rally_base.TESTS = ['test1', 'test2']
self.rally_base.test_name = 'all'
@@ -384,7 +373,7 @@ class OSRallyTesting(unittest.TestCase):
mock_run_task.assert_any_call('test2')
@mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
- '_run_task', return_value=mock.Mock())
+ '_run_task')
def test_run_tests_default(self, mock_run_task):
self.rally_base.TESTS = ['test1', 'test2']
self.rally_base.test_name = 'test1'