From: Morgan Richomme <morgan.richomme@orange.com>
Date: Wed, 11 Oct 2017 11:44:47 +0000 (+0200)
Subject: Update unit test related to vyos_vrouter
X-Git-Tag: opnfv-6.0.0~325^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F79%2F44779%2F4;p=functest.git

Update unit test related to vyos_vrouter

Utilvnf is now mocked to stop triggering the git clone of an
external repo and creating dirs.
Else we may get errors when testing offline.

Co-Authored-By: Cédric Ollivier <cedric.ollivier@orange.com>

Change-Id: Ia7e86593ecca9b9add747ef89b1d5e8d6bdb2d7c
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
index 4f256234b..4d8e9405b 100644
--- a/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
+++ b/functest/tests/unit/vnf/router/test_cloudify_vrouter.py
@@ -18,7 +18,11 @@ from functest.opnfv_tests.vnf.router import cloudify_vrouter
 
 class CloudifyVrouterTesting(unittest.TestCase):
 
-    def setUp(self):
+    @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):
 
         self.tenant = 'cloudify_vrouter'
         self.creds = {'username': 'user',
@@ -41,14 +45,12 @@ class CloudifyVrouterTesting(unittest.TestCase):
                                                      'ram_min': 2048}}}}
 
         with mock.patch('functest.opnfv_tests.vnf.router.cloudify_vrouter.'
-                        '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'}):
+                        'get_config', return_value={
+                            'tenant_images': 'foo',
+                            'orchestrator': self.orchestrator,
+                            'vnf': self.vnf,
+                            'vnf_test_suite': '',
+                            'version': 'whatever'}):
 
             self.router_vnf = cloudify_vrouter.CloudifyVrouter()