summaryrefslogtreecommitdiff
path: root/tests/topotests/conftest.py
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2023-04-24 09:22:42 -0400
committerChristian Hopps <chopps@labn.net>2023-04-24 09:48:26 -0400
commit1a68b138670b2278d17d2854e748526f4a12d11d (patch)
tree38611172fb4064e306e5d81cdc0002f4ff75ec57 /tests/topotests/conftest.py
parent7d12017bd8e3041a02b71b22efcf59b0ba7c7a6f (diff)
tests: fix missed passing pytestconfig arg
Remove the local ConfigOptionProxy and actually use the munet one. Signed-off-by: Christian Hopps <chopps@labn.net>
Diffstat (limited to 'tests/topotests/conftest.py')
-rwxr-xr-xtests/topotests/conftest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/topotests/conftest.py b/tests/topotests/conftest.py
index ce59554b1a..74e308dbc6 100755
--- a/tests/topotests/conftest.py
+++ b/tests/topotests/conftest.py
@@ -15,13 +15,14 @@ import time
import lib.fixtures
import pytest
-from lib.micronet_compat import ConfigOptionsProxy, Mininet
+from lib.micronet_compat import Mininet
from lib.topogen import diagnose_env, get_topogen
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
from munet.cleanup import cleanup_current, cleanup_previous
+from munet.config import ConfigOptionsProxy
from munet.testing.util import pause_test
from lib import topolog, topotest