summaryrefslogtreecommitdiffstats
path: root/functest/tests/unit/openstack/tempest/test_conf_utils.py
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2018-08-29 13:59:49 +0300
committerCédric Ollivier <cedric.ollivier@orange.com>2018-08-29 20:13:35 +0200
commit6f2eba2f3f82f2e145f293f4daf00564d5b312dd (patch)
tree4229a106eb1c8e9f69d8799d587a9a5283823d51 /functest/tests/unit/openstack/tempest/test_conf_utils.py
parent53f29de06005a4c70c9a3816cddb98cf87c88757 (diff)
Create new project/user for tempest tests
JIRA: FUNCTEST-1009 Change-Id: I6b9bca3827ba6cc804c25689a896ca63eec6a78b Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com> (cherry picked from commit 9d03fcdd488c385842b43fd914915cbe4ae5390a)
Diffstat (limited to 'functest/tests/unit/openstack/tempest/test_conf_utils.py')
-rw-r--r--functest/tests/unit/openstack/tempest/test_conf_utils.py14
1 files changed, 2 insertions, 12 deletions
diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index 81febd8c0..7d94b88cc 100644
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@ -106,26 +106,16 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
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'), \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.get_verifier_id') as mock_get_id:
+ return_value='test_verifier_repo_dir'):
self.assertEqual(conf_utils.get_verifier_repo_dir(''),
'test_verifier_repo_dir')
- self.assertTrue(mock_get_id.called)
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'), \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.get_verifier_id') as mock_get_vid, \
- mock.patch('functest.opnfv_tests.openstack.tempest.'
- 'conf_utils.get_verifier_deployment_id') \
- as mock_get_did:
+ return_value='test_verifier_repo_dir'):
self.assertEqual(conf_utils.get_verifier_deployment_dir('', ''),
'test_verifier_repo_dir')
- self.assertTrue(mock_get_vid.called)
- self.assertTrue(mock_get_did.called)
def _test_missing_param(self, params, image_id, flavor_id, alt=False):
with mock.patch('six.moves.configparser.RawConfigParser.'