tests: Fix FRR process shutdown in failed topotest teardown phase

Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>

diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index 3e92bd7565249e5190aa3ac63d6b4853f07a2bcc..7ae4223f72d803d1910a178256cb2c394e39802c 100644 (file)
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -336,7 +336,7 @@ class Topogen(object):
         for gear in self.gears.values():
             errors += gear.stop()
         if len(errors) > 0:
-            assert "Errors found post shutdown - details follow:" == 0, errors
+            logger.error("Errors found post shutdown - details follow: {}".format(errors))
 
         self.net.stop()
 
@@ -714,7 +714,7 @@ class TopoRouter(TopoGear):
         """
         self.logger.debug("stopping")
         self.__stop_internal(False, False)
-        return self.__stop_internal()
+        return self.__stop_internal(True, False)
 
     def startDaemons(self, daemons):
         """

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 92656a084483d7a886bbc95102352780ec096cd2..29471c00fcb12fa680304eb60da1b978eb1ebf0b 100644 (file)
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -1241,7 +1241,7 @@ class Router(Node):
         if self.checkRouterVersion("<", minErrorVersion):
             # ignore errors in old versions
             errors = ""
-        if assertOnError and len(errors) > 0:
+        if assertOnError and errors is not None and len(errors) > 0:
             assert "Errors found - details follow:" == 0, errors
         return errors