Fix warnings in all snaps-related modules

It also adds vping/__init__.py to stop skipping vping unit tests.
It removes the useless import os which is not required for mock (here
the mock patch was simply false).

It should be noted that the code is partially duplicated between
snaps_test_runner.py and vping_base_base.py. A small part of code has
been rewritten to fix that without multi inheritance.

Change-Id: I2e3e181ad7dab8aa41afb1e63d0b6795ff0d1610
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

2 files changed, 19 insertions, 10 deletions

diff --git a/functest/tests/unit/openstack/vping/__init__.py b/functest/tests/unit/openstack/vping/__init__.py
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/functest/tests/unit/openstack/vping/__init__.py
diff --git a/functest/tests/unit/openstack/vping/test_vping.py b/functest/tests/unit/openstack/vping/test_vping.py
index d494a795d..42650deac 100644
--- a/functest/tests/unit/openstack/vping/test_vping.py
+++ b/functest/tests/unit/openstack/vping/test_vping.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
 # Copyright (c) 2017 Cable Television Laboratories, Inc. and others.
 #
 # All rights reserved. This program and the accompanying materials
@@ -8,6 +10,7 @@
 
 # pylint: disable=missing-docstring
 
+import logging
 import unittest
 
 import mock
@@ -46,21 +49,25 @@ class VPingUserdataTesting(unittest.TestCase):
             os_creds=self.os_creds)
 
     @mock.patch('snaps.openstack.utils.deploy_utils.create_vm_instance')
-    @mock.patch('functest.opnfv_tests.openstack.vping.vping_base.os.'
-                'path.exists', return_value=True)
+    @mock.patch('os.path.exists', return_value=True)
     @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
                 return_value=None)
     @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
                 'get_port_ip', return_value='10.0.0.1')
     @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
                 'vm_active', return_value=True)
-    def test_vping_userdata(self, deploy_vm, path_exists, create_flavor,
-                            get_port_ip, vm_active):
+    @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
+                'get_ext_net_name', return_value='foo')
+    def test_vping_userdata(self, *args):
+        # pylint: disable=unused-argument
         with mock.patch('snaps.openstack.utils.deploy_utils.create_image',
                         return_value=OpenStackImage(self.os_creds, None)), \
                 mock.patch('snaps.openstack.utils.deploy_utils.create_network',
                            return_value=OpenStackNetwork(
                                self.os_creds, NetworkConfig(name='foo'))), \
+                mock.patch('snaps.openstack.utils.deploy_utils.create_router',
+                           return_value=OpenStackRouter(
+                               self.os_creds, RouterConfig(name='foo'))), \
                 mock.patch('snaps.openstack.utils.deploy_utils.'
                            'create_vm_instance',
                            return_value=OpenStackVmInstance(
@@ -91,8 +98,7 @@ class VPingSSHTesting(unittest.TestCase):
             os_creds=self.os_creds)
 
     @mock.patch('snaps.openstack.utils.deploy_utils.create_vm_instance')
-    @mock.patch('functest.opnfv_tests.openstack.vping.vping_base.os.'
-                'path.exists', return_value=True)
+    @mock.patch('os.path.exists', return_value=True)
     @mock.patch('snaps.openstack.create_flavor.OpenStackFlavor.create',
                 return_value=None)
     @mock.patch('snaps.openstack.create_instance.OpenStackVmInstance.'
@@ -110,10 +116,8 @@ class VPingSSHTesting(unittest.TestCase):
                 'VPingSSH._do_vping_ssh', return_value=TestCase.EX_OK)
     @mock.patch('functest.opnfv_tests.openstack.snaps.snaps_utils.'
                 'get_ext_net_name', return_value='foo')
-    def test_vping_ssh(self, create_vm, path_exists,
-                       flavor_create, get_port_ip, vm_active, ssh_active,
-                       ssh_client, scp_client, trans_script, do_vping_ssh,
-                       ext_net_name):
+    def test_vping_ssh(self, *args):
+        # pylint: disable=unused-argument
         os_vm_inst = mock.MagicMock(name='get_console_output')
         os_vm_inst.get_console_output.return_value = 'vPing OK'
         ssh_client = mock.MagicMock(name='get_transport')
@@ -159,3 +163,8 @@ class VPingSSHTesting(unittest.TestCase):
                            'OpenStackVmInstance.'
                            'ssh_client', return_value=ssh_client):
             self.assertEquals(TestCase.EX_OK, self.vping_ssh.run())
+
+
+if __name__ == "__main__":
+    logging.disable(logging.CRITICAL)
+    unittest.main(verbosity=2)