aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests/unit/openstack/tempest
diff options
context:
space:
mode:
Diffstat (limited to 'functest/tests/unit/openstack/tempest')
-rw-r--r--functest/tests/unit/openstack/tempest/test_conf_utils.py33
-rw-r--r--functest/tests/unit/openstack/tempest/test_tempest.py12
2 files changed, 2 insertions, 43 deletions
diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index e88bb248..1d5f29a2 100644
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@ -241,39 +241,6 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
conf_utils.configure_tempest('test_dep_dir')
self.assertTrue(mock_upd.called)
- def test_conf_tempest_defcore_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'), \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.ConfigParser.RawConfigParser.'
- 'set') as mset, \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.ConfigParser.RawConfigParser.'
- 'read') as mread, \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.ConfigParser.RawConfigParser.'
- 'write') as mwrite, \
- mock.patch('__builtin__.open', mock.mock_open()), \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.generate_test_accounts_file'), \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.shutil.copyfile'):
- conf_utils.configure_tempest_defcore(
- 'test_dep_dir', 'test_network_name', 'test_image_id',
- 'test_flavor_id', 'test_image_alt_id', 'test_flavor_alt_id',
- 'test_tenant_id')
- mset.assert_any_call('compute', 'image_ref', 'test_image_id')
- mset.assert_any_call('compute', 'image_ref_alt',
- 'test_image_alt_id')
- mset.assert_any_call('compute', 'flavor_ref', 'test_flavor_id')
- mset.assert_any_call('compute', 'flavor_ref_alt',
- 'test_flavor_alt_id')
- self.assertTrue(mread.called)
- self.assertTrue(mwrite.called)
-
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.'
diff --git a/functest/tests/unit/openstack/tempest/test_tempest.py b/functest/tests/unit/openstack/tempest/test_tempest.py
index 77cf28af..ba2c1c48 100644
--- a/functest/tests/unit/openstack/tempest/test_tempest.py
+++ b/functest/tests/unit/openstack/tempest/test_tempest.py
@@ -49,15 +49,6 @@ class OSTempestTesting(unittest.TestCase):
self.tempestcustom = tempest.TempestCustom()
self.tempestdefcore = tempest.TempestDefcore()
- @mock.patch('functest.opnfv_tests.openstack.tempest.tempest.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.'
- 'shutil.copyfile') as mock_copyfile:
- self.tempestcommon.generate_test_list('test_verifier_repo_dir')
- self.assertTrue(mock_copyfile.called)
-
@mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.error')
@mock.patch('functest.opnfv_tests.openstack.tempest.tempest.LOGGER.debug')
def test_gen_tl_cm_missing_file(self, mock_logger_debug,
@@ -69,7 +60,8 @@ class OSTempestTesting(unittest.TestCase):
self.assertRaises(Exception) as context:
msg = "Tempest test list file %s NOT found."
self.tempestcommon.generate_test_list('test_verifier_repo_dir')
- self.assertTrue((msg % conf_utils.TEMPEST_CUSTOM) in context)
+ self.assertTrue(
+ (msg % conf_utils.TEMPEST_CUSTOM) in context.exception)
def test_gen_tl_cm_default(self):
self.tempestcommon.mode = 'custom'