From 226e0f36ee86202c262444cd0712250f4691ab49 Mon Sep 17 00:00:00 2001 From: Juha Kosonen Date: Wed, 6 Mar 2019 10:55:03 +0200 Subject: Merge tempest.py and conf_utils.py Change-Id: I597abdbb5bd3de023aa7b66fa27764ca2ec27f0d Signed-off-by: Juha Kosonen --- .../unit/openstack/tempest/test_conf_utils.py | 150 --------------------- .../tests/unit/openstack/tempest/test_tempest.py | 145 ++++++++++++++++++-- 2 files changed, 133 insertions(+), 162 deletions(-) delete mode 100644 functest/tests/unit/openstack/tempest/test_conf_utils.py (limited to 'functest/tests/unit') diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py deleted file mode 100644 index f99b02b50..000000000 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/env python - -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 - -# pylint: disable=missing-docstring - -import logging -import os -import unittest - -import mock - -from functest.opnfv_tests.openstack.rally import rally -from functest.opnfv_tests.openstack.tempest import conf_utils -from functest.utils import config - - -class OSTempestConfUtilsTesting(unittest.TestCase): - # pylint: disable=too-many-public-methods - - @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils' - '.LOGGER.debug') - def test_create_verifier(self, mock_logger_debug): - mock_popen = mock.Mock() - attrs = {'poll.return_value': None, - 'stdout.readline.return_value': '0'} - mock_popen.configure_mock(**attrs) - - setattr(config.CONF, 'tempest_verifier_name', 'test_verifier_name') - with mock.patch('subprocess.Popen', side_effect=Exception), \ - self.assertRaises(Exception): - conf_utils.create_verifier() - mock_logger_debug.assert_any_call("Tempest test_verifier_name" - " does not exist") - - @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.' - 'create_verifier', return_value=mock.Mock()) - @mock.patch('functest.opnfv_tests.openstack.rally.rally.' - 'RallyBase.create_rally_deployment', return_value=mock.Mock()) - def test_get_verifier_id_default(self, mock_rally, mock_tempest): - # pylint: disable=unused-argument - setattr(config.CONF, 'tempest_verifier_name', 'test_verifier_name') - with mock.patch('functest.opnfv_tests.openstack.tempest.' - 'conf_utils.subprocess.Popen') as mock_popen: - mock_stdout = mock.Mock() - attrs = {'stdout.readline.return_value': 'test_deploy_id'} - mock_stdout.configure_mock(**attrs) - mock_popen.return_value = mock_stdout - - self.assertEqual(conf_utils.get_verifier_id(), - 'test_deploy_id') - - def test_get_depl_id_default(self): - setattr(config.CONF, 'tempest_verifier_name', 'test_deploy_name') - with mock.patch('functest.opnfv_tests.openstack.tempest.' - 'conf_utils.subprocess.Popen') as mock_popen: - mock_stdout = mock.Mock() - attrs = {'stdout.readline.return_value': 'test_deploy_id'} - mock_stdout.configure_mock(**attrs) - mock_popen.return_value = mock_stdout - - self.assertEqual(rally.RallyBase.get_verifier_deployment_id(), - 'test_deploy_id') - - 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'): - self.assertEqual(conf_utils.get_verifier_repo_dir(''), - 'test_verifier_repo_dir') - - 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'): - self.assertEqual(conf_utils.get_verifier_deployment_dir('', ''), - 'test_verifier_repo_dir') - - def _test_missing_param(self, params, image_id, flavor_id, alt=False): - with mock.patch('six.moves.configparser.RawConfigParser.' - 'set') as mset, \ - mock.patch('six.moves.configparser.RawConfigParser.' - 'read') as mread, \ - mock.patch('six.moves.configparser.RawConfigParser.' - 'write') as mwrite, \ - mock.patch('six.moves.builtins.open', mock.mock_open()), \ - mock.patch('functest.utils.functest_utils.yaml.safe_load', - return_value={'validation': {'ssh_timeout': 300}}): - os.environ['OS_INTERFACE'] = '' - if not alt: - conf_utils.configure_tempest_update_params( - 'test_conf_file', image_id=image_id, - flavor_id=flavor_id) - mset.assert_any_call(params[0], params[1], params[2]) - else: - conf_utils.configure_tempest_update_params( - 'test_conf_file', image_alt_id=image_id, - flavor_alt_id=flavor_id) - mset.assert_any_call(params[0], params[1], params[2]) - self.assertTrue(mread.called) - self.assertTrue(mwrite.called) - - def test_upd_missing_image_id(self): - self._test_missing_param(('compute', 'image_ref', 'test_image_id'), - 'test_image_id', None) - - def test_upd_missing_image_id_alt(self): - self._test_missing_param( - ('compute', 'image_ref_alt', 'test_image_id_alt'), - 'test_image_id_alt', None, alt=True) - - def test_upd_missing_flavor_id(self): - self._test_missing_param(('compute', 'flavor_ref', 'test_flavor_id'), - None, 'test_flavor_id') - - def test_upd_missing_flavor_id_alt(self): - self._test_missing_param( - ('compute', 'flavor_ref_alt', 'test_flavor_id_alt'), - None, 'test_flavor_id_alt', alt=True) - - def test_verif_missing_conf_file(self): - with mock.patch('functest.opnfv_tests.openstack.tempest.' - 'conf_utils.os.path.isfile', - return_value=False), \ - mock.patch('subprocess.check_output') as mexe, \ - self.assertRaises(Exception) as context: - conf_utils.configure_verifier('test_dep_dir') - mexe.assert_called_once_with("rally verify configure-verifier") - msg = ("Tempest configuration file 'test_dep_dir/tempest.conf'" - " NOT found.") - self.assertTrue(msg in context.exception) - - def test_configure_verifier_default(self): - with mock.patch('functest.opnfv_tests.openstack.tempest.' - 'conf_utils.os.path.isfile', - return_value=True), \ - mock.patch('subprocess.check_output') as mexe: - self.assertEqual(conf_utils.configure_verifier('test_dep_dir'), - 'test_dep_dir/tempest.conf') - mexe.assert_called_once_with( - ['rally', 'verify', 'configure-verifier', '--reconfigure', - '--id', str(getattr(config.CONF, 'tempest_verifier_name'))]) - - -if __name__ == "__main__": - logging.disable(logging.CRITICAL) - unittest.main(verbosity=2) diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py index 646f88290..de543b5d8 100644 --- a/functest/tests/unit/openstack/tempest/test_tempest.py +++ b/functest/tests/unit/openstack/tempest/test_tempest.py @@ -14,8 +14,9 @@ import unittest import mock from xtesting.core import testcase +from functest.opnfv_tests.openstack.rally import rally from functest.opnfv_tests.openstack.tempest import tempest -from functest.opnfv_tests.openstack.tempest import conf_utils +from functest.utils import config class OSTempestTesting(unittest.TestCase): @@ -28,18 +29,18 @@ class OSTempestTesting(unittest.TestCase): mock.patch('functest.opnfv_tests.openstack.rally.rally.' 'RallyBase.create_rally_deployment'), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' - 'conf_utils.create_verifier'), \ + 'TempestCommon.create_verifier'), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' - 'conf_utils.get_verifier_id', + 'TempestCommon.get_verifier_id', return_value='test_deploy_id'), \ mock.patch('functest.opnfv_tests.openstack.rally.rally.' 'RallyBase.get_verifier_deployment_id', return_value='test_deploy_id'), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' - 'conf_utils.get_verifier_repo_dir', + 'TempestCommon.get_verifier_repo_dir', return_value='test_verifier_repo_dir'), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' - 'conf_utils.get_verifier_deployment_dir', + 'TempestCommon.get_verifier_deployment_dir', return_value='test_verifier_deploy_dir'), \ mock.patch('os_client_config.make_shade'): self.tempestcommon = tempest.TempestCommon() @@ -56,7 +57,7 @@ class OSTempestTesting(unittest.TestCase): msg = "Tempest test list file %s NOT found." self.tempestcommon.generate_test_list() self.assertTrue( - (msg % conf_utils.TEMPEST_CUSTOM) in context.exception) + (msg % self.tempestcommon.TEMPEST_CUSTOM) in context.exception) @mock.patch('subprocess.check_output') @mock.patch('os.remove') @@ -122,7 +123,7 @@ class OSTempestTesting(unittest.TestCase): mock.mock_open()) as mock_open, \ mock.patch.object(self.tempestcommon, 'read_file', return_value=['test1', 'test2']): - conf_utils.TEMPEST_BLACKLIST = Exception + self.tempestcommon.TEMPEST_BLACKLIST = Exception os.environ['DEPLOY_SCENARIO'] = 'deploy_scenario' self.tempestcommon.apply_tempest_blacklist() obj = mock_open() @@ -162,9 +163,9 @@ class OSTempestTesting(unittest.TestCase): return_value=[r'\} tempest\.']), \ mock.patch('functest.opnfv_tests.openstack.tempest.tempest.' 'subprocess.Popen'): - conf_utils.TEMPEST_LIST = 'test_tempest_list' + self.tempestcommon.TEMPEST_LIST = 'test_tempest_list' cmd = ["rally", "verify", "start", "--load-list", - conf_utils.TEMPEST_LIST] + self.tempestcommon.TEMPEST_LIST] with self.assertRaises(Exception): self.tempestcommon.run_verifier_tests() mock_logger_info. \ @@ -213,9 +214,9 @@ class OSTempestTesting(unittest.TestCase): def test_run_apply_blacklist_ko(self): with mock.patch.object(self.tempestcommon, 'generate_test_list'), \ - mock.patch.object( - self.tempestcommon, 'apply_tempest_blacklist', - side_effect=Exception()): + mock.patch.object(self.tempestcommon, + 'apply_tempest_blacklist', + side_effect=Exception()): self._test_run(testcase.TestCase.EX_RUN_ERROR) def test_run_verifier_tests_ko(self): @@ -250,6 +251,126 @@ class OSTempestTesting(unittest.TestCase): self._test_run(testcase.TestCase.EX_OK) args[0].assert_called_once_with() + @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug') + def test_create_verifier(self, mock_logger_debug): + mock_popen = mock.Mock() + attrs = {'poll.return_value': None, + 'stdout.readline.return_value': '0'} + mock_popen.configure_mock(**attrs) + + setattr(config.CONF, 'tempest_verifier_name', 'test_verifier_name') + with mock.patch('subprocess.Popen', side_effect=Exception), \ + self.assertRaises(Exception): + self.tempestcommon.create_verifier() + mock_logger_debug.assert_any_call("Tempest test_verifier_name" + " does not exist") + + def test_get_verifier_id_default(self): + setattr(config.CONF, 'tempest_verifier_name', 'test_verifier_name') + + with mock.patch('functest.opnfv_tests.openstack.tempest.' + 'tempest.subprocess.Popen') as mock_popen: + mock_stdout = mock.Mock() + attrs = {'stdout.readline.return_value': 'test_deploy_id'} + mock_stdout.configure_mock(**attrs) + mock_popen.return_value = mock_stdout + + self.assertEqual(self.tempestcommon.get_verifier_id(), + 'test_deploy_id') + + def test_get_depl_id_default(self): + setattr(config.CONF, 'tempest_verifier_name', 'test_deploy_name') + with mock.patch('functest.opnfv_tests.openstack.tempest.' + 'tempest.subprocess.Popen') as mock_popen: + mock_stdout = mock.Mock() + attrs = {'stdout.readline.return_value': 'test_deploy_id'} + mock_stdout.configure_mock(**attrs) + mock_popen.return_value = mock_stdout + + self.assertEqual(rally.RallyBase.get_verifier_deployment_id(), + 'test_deploy_id') + + def test_get_verif_repo_dir_default(self): + with mock.patch('functest.opnfv_tests.openstack.tempest.' + 'tempest.os.path.join', + return_value='test_verifier_repo_dir'): + self.assertEqual(self.tempestcommon.get_verifier_repo_dir(''), + 'test_verifier_repo_dir') + + def test_get_depl_dir_default(self): + with mock.patch('functest.opnfv_tests.openstack.tempest.' + 'tempest.os.path.join', + return_value='test_verifier_repo_dir'): + self.assertEqual( + self.tempestcommon.get_verifier_deployment_dir('', ''), + 'test_verifier_repo_dir') + + def _test_missing_param(self, params, image_id, flavor_id, alt=False): + with mock.patch('six.moves.configparser.RawConfigParser.' + 'set') as mset, \ + mock.patch('six.moves.configparser.RawConfigParser.' + 'read') as mread, \ + mock.patch('six.moves.configparser.RawConfigParser.' + 'write') as mwrite, \ + mock.patch('six.moves.builtins.open', mock.mock_open()), \ + mock.patch('functest.utils.functest_utils.yaml.safe_load', + return_value={'validation': {'ssh_timeout': 300}}): + os.environ['OS_INTERFACE'] = '' + if not alt: + self.tempestcommon.configure_tempest_update_params( + 'test_conf_file', image_id=image_id, + flavor_id=flavor_id) + mset.assert_any_call(params[0], params[1], params[2]) + else: + self.tempestcommon.configure_tempest_update_params( + 'test_conf_file', image_alt_id=image_id, + flavor_alt_id=flavor_id) + mset.assert_any_call(params[0], params[1], params[2]) + self.assertTrue(mread.called) + self.assertTrue(mwrite.called) + + def test_upd_missing_image_id(self): + self._test_missing_param(('compute', 'image_ref', 'test_image_id'), + 'test_image_id', None) + + def test_upd_missing_image_id_alt(self): + self._test_missing_param( + ('compute', 'image_ref_alt', 'test_image_id_alt'), + 'test_image_id_alt', None, alt=True) + + def test_upd_missing_flavor_id(self): + self._test_missing_param(('compute', 'flavor_ref', 'test_flavor_id'), + None, 'test_flavor_id') + + def test_upd_missing_flavor_id_alt(self): + self._test_missing_param( + ('compute', 'flavor_ref_alt', 'test_flavor_id_alt'), + None, 'test_flavor_id_alt', alt=True) + + def test_verif_missing_conf_file(self): + with mock.patch('functest.opnfv_tests.openstack.tempest.' + 'tempest.os.path.isfile', + return_value=False), \ + mock.patch('subprocess.check_output') as mexe, \ + self.assertRaises(Exception) as context: + self.tempestcommon.configure_verifier('test_dep_dir') + mexe.assert_called_once_with("rally verify configure-verifier") + msg = ("Tempest configuration file 'test_dep_dir/tempest.conf'" + " NOT found.") + self.assertTrue(msg in context.exception) + + def test_configure_verifier_default(self): + with mock.patch('functest.opnfv_tests.openstack.tempest.' + 'tempest.os.path.isfile', + return_value=True), \ + mock.patch('subprocess.check_output') as mexe: + self.assertEqual( + self.tempestcommon.configure_verifier('test_dep_dir'), + 'test_dep_dir/tempest.conf') + mexe.assert_called_once_with( + ['rally', 'verify', 'configure-verifier', '--reconfigure', + '--id', str(getattr(config.CONF, 'tempest_verifier_name'))]) + if __name__ == "__main__": logging.disable(logging.CRITICAL) -- cgit 1.2.3-korg