aboutsummaryrefslogtreecommitdiffstats
path: root/functest/tests
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-01-29 13:46:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-29 13:46:23 +0000
commit3a042e00c533dae47014842ed345da6b321f5eb9 (patch)
tree76b07e57942b37d99b125fbf45b81ce2d88b637b /functest/tests
parent5a77070ed767158017ceb8ea3c319af60c86b830 (diff)
parent01efa1e4229157b46d352bce202ed4192992dd3f (diff)
Merge "Fix last Pylint error in Functest"
Diffstat (limited to 'functest/tests')
-rw-r--r--functest/tests/unit/vnf/router/test_cloudify_vrouter.py27
1 files changed, 15 insertions, 12 deletions
diff --git a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
index 2e24e7e9..9711da72 100644
--- a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
+++ b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
@@ -20,11 +20,7 @@ from functest.opnfv_tests.vnf.router import cloudify_vrouter
class CloudifyVrouterTesting(unittest.TestCase):
- @mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.Utilvnf')
- @mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.vrouter_base'
- '.Utilvnf')
- @mock.patch('os.makedirs')
- def setUp(self, *args):
+ def setUp(self):
self.tenant = 'cloudify_vrouter'
self.creds = {'username': 'user',
@@ -46,13 +42,20 @@ class CloudifyVrouterTesting(unittest.TestCase):
{'name': 'm1.medium',
'ram_min': 2048}}}}
- with mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.'
- 'get_config', return_value={
- 'tenant_images': 'foo',
- 'orchestrator': self.orchestrator,
- 'vnf': self.vnf,
- 'vnf_test_suite': '',
- 'version': 'whatever'}):
+ # pylint: disable=bad-continuation
+ with mock.patch(
+ 'functest.opnfv_tests.vnf.router.cloudify_vrouter.Utilvnf'), \
+ mock.patch('functest.opnfv_tests.vnf.router.'
+ 'cloudify_vrouter.vrouter_base.Utilvnf'), \
+ mock.patch('os.makedirs'), \
+ mock.patch(
+ 'functest.opnfv_tests.vnf.router.cloudify_vrouter.'
+ 'get_config',
+ return_value={
+ 'tenant_images': 'foo',
+ 'orchestrator': self.orchestrator,
+ 'vnf': self.vnf, 'vnf_test_suite': '',
+ 'version': 'whatever'}):
self.router_vnf = cloudify_vrouter.CloudifyVrouter()