diff options
| -rwxr-xr-x | tests/topotests/conftest.py | 16 | ||||
| -rw-r--r-- | tests/topotests/kinds.yaml | 30 | ||||
| -rw-r--r-- | tests/topotests/pytest.ini | 2 |
3 files changed, 47 insertions, 1 deletions
diff --git a/tests/topotests/conftest.py b/tests/topotests/conftest.py index 8e4d13df7d..31d796ccb8 100755 --- a/tests/topotests/conftest.py +++ b/tests/topotests/conftest.py @@ -5,6 +5,7 @@ Topotest conftest.py file. # pylint: disable=consider-using-f-string import glob +import logging import os import re import resource @@ -16,7 +17,7 @@ import lib.fixtures import pytest from lib.micronet_compat import ConfigOptionsProxy, Mininet from lib.topogen import diagnose_env, get_topogen -from lib.topolog import logger +from lib.topolog import get_test_logdir, logger from lib.topotest import json_cmp_result from munet import cli from munet.base import Commander, proc_error @@ -25,6 +26,19 @@ from munet.testing.util import pause_test from lib import topolog, topotest +try: + # Used by munet native tests + from munet.testing.fixtures import event_loop, unet # pylint: disable=all # noqa + + @pytest.fixture(scope="module") + def rundir_module(pytestconfig): + d = os.path.join(pytestconfig.option.rundir, get_test_logdir()) + logging.debug("rundir_module: test module rundir %s", d) + return d + +except (AttributeError, ImportError): + pass + def pytest_addoption(parser): """ diff --git a/tests/topotests/kinds.yaml b/tests/topotests/kinds.yaml new file mode 100644 index 0000000000..127790ed07 --- /dev/null +++ b/tests/topotests/kinds.yaml @@ -0,0 +1,30 @@ +version: 1 +kinds: + - name: frr + cmd: | + chown frr:frr -R /var/run/frr + chown frr:frr -R /var/log/frr + /usr/lib/frr/frrinit.sh start + tail -F /var/log/frr/frr.log + cleanup-cmd: | + /usr/lib/frr/frrinit.sh stop + volumes: + - "./%NAME%:/etc/frr" + - "%RUNDIR%/var.log.frr:/var/log/frr" + - "%RUNDIR%/var.run.frr:/var/run/frr" + cap-add: + - SYS_ADMIN + - AUDIT_WRITE + merge: ["volumes"] +cli: + commands: + - name: "" + exec: "vtysh -c '{}'" + format: "[ROUTER ...] COMMAND" + help: "execute vtysh COMMAND on the router[s]" + kinds: ["frr"] + - name: "vtysh" + exec: "/usr/bin/vtysh" + format: "vtysh ROUTER [ROUTER ...]" + new-window: true + kinds: ["frr"] diff --git a/tests/topotests/pytest.ini b/tests/topotests/pytest.ini index ccbc9d2a16..322c07025f 100644 --- a/tests/topotests/pytest.ini +++ b/tests/topotests/pytest.ini @@ -1,6 +1,8 @@ # Skip pytests example directory [pytest] +asyncio_mode = auto + # We always turn this on inside conftest.py, default shown # addopts = --junitxml=<rundir>/topotests.xml |