proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-09 07:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: Fix FRR process shutdown in failed topotest teardown phase

Browse Source 
Signed-off-by: Martin Winter <mwinter@opensourcerouting.org>
This commit is contained in:
Martin Winter 2020-11-25 22:59:40 +01:00
parent be2656eda2
commit 1a31ada871
No known key found for this signature in database
GPG Key ID: 05A4ECF8C0102306
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/topotests/lib/topogen.py
View File

@ -336,7 +336,7 @@ class Topogen(object):
for gear in self.gears.values(): for gear in self.gears.values():
errors += gear.stop() errors += gear.stop()
if len(errors) > 0: 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() self.net.stop()
@ -714,7 +714,7 @@ class TopoRouter(TopoGear):
""" """
self.logger.debug("stopping") self.logger.debug("stopping")
self.__stop_internal(False, False) self.__stop_internal(False, False)
return self.__stop_internal() return self.__stop_internal(True, False)
def startDaemons(self, daemons): def startDaemons(self, daemons):
""" """

2
tests/topotests/lib/topotest.py
View File

@ -1241,7 +1241,7 @@ class Router(Node):
if self.checkRouterVersion("<", minErrorVersion): if self.checkRouterVersion("<", minErrorVersion):
# ignore errors in old versions # ignore errors in old versions
errors = "" 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 assert "Errors found - details follow:" == 0, errors
return errors return errors