summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-02-20 10:17:24 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-02-20 10:17:24 +0000
commit78a21107e377f4f4722fd8d570dc0394f6ae5692 (patch)
treeb0ac123376fbd20273a35487fcd62eb53cf771ed
parent1a04979f3fff45117754653e20758d2ac6a02615 (diff)
parentf45009936ef29cef3a369f8dd45539a1186e85d9 (diff)
Merge "Remove deprecated monkey patches"
-rw-r--r--functest/tests/unit/vnf/epc/test_juju_epc.py19
1 files changed, 1 insertions, 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):