From f45009936ef29cef3a369f8dd45539a1186e85d9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Mon, 19 Feb 2018 21:14:06 +0100 Subject: [PATCH] Remove deprecated monkey patches MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit OpenStack utils are being removed. Change-Id: I2a41297034654f678afa5a7a818961a4cd0cee73 Signed-off-by: Cédric Ollivier --- functest/tests/unit/vnf/epc/test_juju_epc.py | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/functest/tests/unit/vnf/epc/test_juju_epc.py b/functest/tests/unit/vnf/epc/test_juju_epc.py index b3eef8622..6b4137069 100644 --- a/functest/tests/unit/vnf/epc/test_juju_epc.py +++ b/functest/tests/unit/vnf/epc/test_juju_epc.py @@ -52,15 +52,7 @@ class JujuEpcTesting(unittest.TestCase): return_value={'tenant_images': 'foo', 'orchestrator': self.orchestrator, 'vnf': self.vnf, 'vnf_test_suite': '', - 'version': 'whatever'}), \ - mock.patch('functest.utils.openstack_utils.get_keystone_client', - return_value='test'), \ - mock.patch('functest.utils.openstack_utils.get_glance_client', - return_value='test'), \ - mock.patch('functest.utils.openstack_utils.get_neutron_client', - return_value='test'), \ - mock.patch('functest.utils.openstack_utils.get_nova_client', - return_value='test'): + 'version': 'whatever'}): self.epc_vnf = juju_epc.JujuEpc() self.images = {'image1': 'url1', @@ -70,15 +62,6 @@ class JujuEpcTesting(unittest.TestCase): 'test_vnf': {}} @unittest.skip("It must be fixed. Please see JIRA FUNCTEST-915") - @mock.patch('functest.utils.openstack_utils.get_keystone_client', - return_value='test') - @mock.patch('functest.utils.openstack_utils.get_or_create_tenant_for_vnf', - return_value=True) - @mock.patch('functest.utils.openstack_utils.get_or_create_user_for_vnf', - return_value=True) - @mock.patch('functest.utils.openstack_utils.get_credentials', - return_value={'auth_url': 'test/v1', - 'project_name': 'test_tenant'}) @mock.patch('snaps.openstack.create_image.OpenStackImage.create') @mock.patch('os.system') def test_prepare_default(self, *args): -- 2.16.6