From 022126a694db1e582de3d1af7bc763f43959af1b Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Fri, 24 Apr 2020 14:59:35 -0400 Subject: Add missing ansible.cfg for integration testing Add test dependencies for unit tests. Fix import statement for vyos_static_route unit tests. Signed-off-by: Paul Belanger --- test-requirements.txt | 2 ++ tests/integration/network-integration.cfg | 4 ++++ tests/unit/modules/network/vyos/test_vyos_static_route.py | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 tests/integration/network-integration.cfg diff --git a/test-requirements.txt b/test-requirements.txt index 50373960..3f3af99d 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 00000000..d12c1efe --- /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 762508ce..8eef5fbc 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.modules.network.vyos import vyos_static_route from ansible_collections.vyos.vyos.tests.unit.modules.utils import ( set_module_args, ) @@ -30,18 +30,18 @@ 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() -- cgit v1.2.3