diff options
| author | Christian Hopps <chopps@labn.net> | 2024-01-15 23:25:41 +0100 |
|---|---|---|
| committer | Christian Hopps <chopps@labn.net> | 2024-01-15 23:25:41 +0100 |
| commit | 37f26046f4fdf53ebe85bff3121dbb2e5cdc8373 (patch) | |
| tree | 1480868182fcfa0e2645625d6a348d70dd2b34e6 /tests | |
| parent | Merge pull request #15154 from idryzhov/mgmt-get-data (diff) | |
| download | frr-37f26046f4fdf53ebe85bff3121dbb2e5cdc8373.tar.xz frr-37f26046f4fdf53ebe85bff3121dbb2e5cdc8373.zip | |
tests: set environment variable munet 0.13.12 will use
Signed-off-by: Christian Hopps <chopps@labn.net>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/topotests/conftest.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/topotests/conftest.py b/tests/topotests/conftest.py index b1f8d50d0..23eab68db 100755 --- a/tests/topotests/conftest.py +++ b/tests/topotests/conftest.py @@ -17,6 +17,7 @@ from pathlib import Path import lib.fixtures import pytest +from lib.common_config import generate_support_bundle from lib.micronet_compat import Mininet from lib.topogen import diagnose_env, get_topogen from lib.topolog import get_test_logdir, logger @@ -26,7 +27,7 @@ from munet.base import Commander, proc_error from munet.cleanup import cleanup_current, cleanup_previous from munet.config import ConfigOptionsProxy from munet.testing.util import pause_test -from lib.common_config import generate_support_bundle + from lib import topolog, topotest try: @@ -598,6 +599,7 @@ def pytest_runtest_setup(item): module = item.parent.module script_dir = os.path.abspath(os.path.dirname(module.__file__)) os.environ["PYTEST_TOPOTEST_SCRIPTDIR"] = script_dir + os.environ["CONFIGDIR"] = script_dir def pytest_exception_interact(node, call, report): |