summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoransible-zuul[bot] <48994755+ansible-zuul[bot]@users.noreply.github.com>2020-04-24 23:57:39 +0000
committerGitHub <noreply@github.com>2020-04-24 23:57:39 +0000
commit300bfac93e63fd87793527f8741715e5e27ad82a (patch)
tree9ca652dee7f372569659232a9ecf7877c5bca861
parent77e8b041b2983415ac36eb6264f6e385ac87b074 (diff)
parent022126a694db1e582de3d1af7bc763f43959af1b (diff)
downloadvyos.vyos-300bfac93e63fd87793527f8741715e5e27ad82a.tar.gz
vyos.vyos-300bfac93e63fd87793527f8741715e5e27ad82a.zip
Merge pull request #22 from pabelanger/temp/ansible.cfg
Add missing ansible.cfg for integration testing Reviewed-by: https://github.com/apps/ansible-zuul
-rw-r--r--test-requirements.txt2
-rw-r--r--tests/integration/network-integration.cfg4
-rw-r--r--tests/unit/modules/network/vyos/test_vyos_static_route.py8
3 files changed, 10 insertions, 4 deletions
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()