]> git.puffer.fish Git - mirror/frr.git/commitdiff
tests: set environment variable munet 0.13.12 will use
authorChristian Hopps <chopps@labn.net>
Mon, 15 Jan 2024 22:25:41 +0000 (22:25 +0000)
committerChristian Hopps <chopps@labn.net>
Mon, 15 Jan 2024 22:25:41 +0000 (22:25 +0000)
Signed-off-by: Christian Hopps <chopps@labn.net>
tests/topotests/conftest.py

index b1f8d50d067ecaa4142733aa1cbe9647015a3abb..23eab68db426b9d650c13df43a3033b953449c46 100755 (executable)
@@ -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):