diff --git a/test-requirements.txt b/test-requirements.txt index 5037396..3f3af99 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,4 +1,6 @@ black ; python_version > '3.5' flake8 +mock pexpect +pytest-xdist yamllint diff --git a/tests/integration/network-integration.cfg b/tests/integration/network-integration.cfg new file mode 100644 index 0000000..d12c1ef --- /dev/null +++ b/tests/integration/network-integration.cfg @@ -0,0 +1,4 @@ +[persistent_connection] +command_timeout = 100 +connect_timeout = 100 +connect_retry_timeout = 100 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 762508c..8eef5fb 100644 --- a/tests/unit/modules/network/vyos/test_vyos_static_route.py +++ b/tests/unit/modules/network/vyos/test_vyos_static_route.py @@ -1,71 +1,71 @@ # (c) 2016 Red Hat Inc. # # This file is part of Ansible # # Ansible is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # Ansible is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with Ansible. If not, see . # Make coding more python3-ish 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.modules.network.vyos import vyos_static_route from ansible_collections.vyos.vyos.tests.unit.modules.utils import ( set_module_args, ) from .vyos_module import TestVyosModule class TestVyosStaticRouteModule(TestVyosModule): - module = _vyos_static_route + module = vyos_static_route def setUp(self): super(TestVyosStaticRouteModule, self).setUp() self.mock_get_config = patch( - "ansible.modules.network.vyos._vyos_static_route.get_config" + "ansible.modules.network.vyos.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.modules.network.vyos.vyos_static_route.load_config" ) self.load_config = self.mock_load_config.start() def tearDown(self): super(TestVyosStaticRouteModule, self).tearDown() self.mock_get_config.stop() self.mock_load_config.stop() def load_fixtures(self, commands=None, transport="cli"): self.load_config.return_value = dict(diff=None, session="session") def test_vyos_static_route_present(self): set_module_args( dict( prefix="172.26.0.0/16", next_hop="172.26.4.1", admin_distance="1", ) ) result = self.execute_module(changed=True) self.assertEqual( result["commands"], [ "set protocols static route 172.26.0.0/16 next-hop 172.26.4.1 distance 1" ], )