From fbb82a0875dacc8200d3f663c3286104d0a1afbf Mon Sep 17 00:00:00 2001 From: GomathiselviS Date: Fri, 24 Jul 2020 16:16:03 -0400 Subject: [vyos] Fix sanity issues (#58) [vyos] Fix sanity issues Reviewed-by: https://github.com/apps/ansible-zuul --- tests/unit/compat/mock.py | 2 +- tests/unit/modules/network/vyos/test_vyos_static_route.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'tests/unit') diff --git a/tests/unit/compat/mock.py b/tests/unit/compat/mock.py index b45d6b5c..b7df24ff 100644 --- a/tests/unit/compat/mock.py +++ b/tests/unit/compat/mock.py @@ -24,6 +24,7 @@ __metaclass__ = type Compat module for Python3.x's unittest.mock module """ import sys +import _io # Python 2.7 @@ -100,7 +101,6 @@ if sys.version_info >= (3,) and sys.version_info < (3, 4, 4): global file_spec if file_spec is None: - import _io file_spec = list( set(dir(_io.TextIOWrapper)).union(set(dir(_io.BytesIO))) diff --git a/tests/unit/modules/network/vyos/test_vyos_static_route.py b/tests/unit/modules/network/vyos/test_vyos_static_route.py index 8eef5fbc..21f11394 100644 --- a/tests/unit/modules/network/vyos/test_vyos_static_route.py +++ b/tests/unit/modules/network/vyos/test_vyos_static_route.py @@ -21,7 +21,7 @@ from __future__ import absolute_import, division, print_function __metaclass__ = type from ansible_collections.vyos.vyos.tests.unit.compat.mock import patch -from ansible.modules.network.vyos import vyos_static_route +from ansible_collections.vyos.vyos.plugins.modules import vyos_static_route from ansible_collections.vyos.vyos.tests.unit.modules.utils import ( set_module_args, ) @@ -36,13 +36,14 @@ class TestVyosStaticRouteModule(TestVyosModule): super(TestVyosStaticRouteModule, self).setUp() self.mock_get_config = patch( - "ansible.modules.network.vyos.vyos_static_route.get_config" + "ansible_collections.vyos.vyos.plugins.modules.vyos_static_route.get_config" ) self.get_config = self.mock_get_config.start() self.mock_load_config = patch( - "ansible.modules.network.vyos.vyos_static_route.load_config" + "ansible_collections.vyos.vyos.plugins.modules.vyos_static_route.load_config" ) + self.load_config = self.mock_load_config.start() def tearDown(self): @@ -52,6 +53,7 @@ class TestVyosStaticRouteModule(TestVyosModule): self.mock_load_config.stop() def load_fixtures(self, commands=None, transport="cli"): + self.get_config.return_value = "" self.load_config.return_value = dict(diff=None, session="session") def test_vyos_static_route_present(self): -- cgit v1.2.3