diff options
Diffstat (limited to 'functest/tests/unit/openstack/tempest/test_conf_utils.py')
-rw-r--r-- | functest/tests/unit/openstack/tempest/test_conf_utils.py | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py index 19b07ba3e..f99b02b50 100644 --- a/functest/tests/unit/openstack/tempest/test_conf_utils.py +++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py @@ -13,6 +13,7 @@ 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 @@ -21,21 +22,6 @@ class OSTempestConfUtilsTesting(unittest.TestCase): # pylint: disable=too-many-public-methods @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils' - '.get_verifier_deployment_id', return_value='foo') - @mock.patch('subprocess.check_output') - def test_create_rally_deployment(self, mock_exec, mock_get_id): - # pylint: disable=unused-argument - self.assertEqual(conf_utils.create_rally_deployment(), 'foo') - calls = [ - mock.call(['rally', 'deployment', 'destroy', '--deployment', - str(getattr(config.CONF, 'rally_deployment_name'))]), - mock.call(['rally', 'deployment', 'create', '--fromenv', '--name', - str(getattr(config.CONF, 'rally_deployment_name'))], - env=None), - mock.call(['rally', 'deployment', 'check'])] - mock_exec.assert_has_calls(calls) - - @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils' '.LOGGER.debug') def test_create_verifier(self, mock_logger_debug): mock_popen = mock.Mock() @@ -52,8 +38,8 @@ class OSTempestConfUtilsTesting(unittest.TestCase): @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.' 'create_verifier', return_value=mock.Mock()) - @mock.patch('functest.opnfv_tests.openstack.tempest.conf_utils.' - 'create_rally_deployment', 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') @@ -76,7 +62,7 @@ class OSTempestConfUtilsTesting(unittest.TestCase): mock_stdout.configure_mock(**attrs) mock_popen.return_value = mock_stdout - self.assertEqual(conf_utils.get_verifier_deployment_id(), + self.assertEqual(rally.RallyBase.get_verifier_deployment_id(), 'test_deploy_id') def test_get_verif_repo_dir_default(self): |