From 02bd6e30668b477781ab007e82bfe2a207baa8b7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 24 Feb 2018 12:09:20 +0100 Subject: Update Functest to meet last snaps updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It removes obsolete mockey patches in Rally unit tests and adds keystone client as params when needed in orchestra_*ims.py [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/52473/ Change-Id: Id02954d16f5f54cc0c390fadb498e14c6bab6ff9 Signed-off-by: Cédric Ollivier --- functest/tests/unit/openstack/rally/test_rally.py | 4 ---- 1 file changed, 4 deletions(-) (limited to 'functest/tests/unit/openstack/rally/test_rally.py') diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py index 5d82d91f9..9cc6bf53d 100644 --- a/functest/tests/unit/openstack/rally/test_rally.py +++ b/functest/tests/unit/openstack/rally/test_rally.py @@ -329,8 +329,6 @@ class OSRallyTesting(unittest.TestCase): @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.utils.keystone_utils.keystone_client') - @mock.patch('snaps.openstack.utils.keystone_utils.get_project') @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create', return_value=None) def test_prepare_env_flavor_creation_failed(self, mock_create_flavor, @@ -350,8 +348,6 @@ class OSRallyTesting(unittest.TestCase): @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.utils.keystone_utils.keystone_client') - @mock.patch('snaps.openstack.utils.keystone_utils.get_project') @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create', side_effect=[mock.Mock, None]) def test_prepare_env_flavor_alt_creation_failed(self, mock_create_flavor, -- cgit 1.2.3-korg