summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2023-03-24 17:59:33 -0400
committerChristian Hopps <chopps@labn.net>2023-04-07 05:56:12 +0000
commit66707495d9760e945de2aed6eb362c2bd18fcfd9 (patch)
tree46c8a2a5fbe197e4e8008636fdb6e67fac7db961
parentcd453c23f6026c6d76e6393dc7df053e2065c242 (diff)
tests: cleanup infra
Signed-off-by: Christian Hopps <chopps@labn.net>
-rw-r--r--tests/topotests/lib/micronet_compat.py4
-rw-r--r--tests/topotests/lib/topogen.py2
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/topotests/lib/micronet_compat.py b/tests/topotests/lib/micronet_compat.py
index 5a69c56d8d..edbd360084 100644
--- a/tests/topotests/lib/micronet_compat.py
+++ b/tests/topotests/lib/micronet_compat.py
@@ -161,12 +161,10 @@ class Mininet(Micronet):
g_mnet_inst = None
- def __init__(self, controller=None):
+ def __init__(self):
"""
Create a Micronet.
"""
- assert not controller
-
if Mininet.g_mnet_inst is not None:
Mininet.g_mnet_inst.stop()
Mininet.g_mnet_inst = self
diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index f2771789d6..646b284ef6 100644
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -212,7 +212,7 @@ class Topogen(object):
# Mininet(Micronet) to build the actual topology.
assert not inspect.isclass(topodef)
- self.net = Mininet(controller=None)
+ self.net = Mininet()
# New direct way: Either a dictionary defines the topology or a build function
# is supplied, or a json filename all of which build the topology by calling