From 436aa319bc3f8684275fa1617162dcc8c61430b6 Mon Sep 17 00:00:00 2001 From: Lou Berger Date: Sat, 30 Jun 2018 15:35:54 -0400 Subject: [PATCH] lib: don't assert on shutdown errors in rel < 5.0 Signed-off-by: Lou Berger --- tests/topotests/lib/topotest.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index f0412dc2df..7133546e86 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -561,7 +561,7 @@ class Router(Node): super(Router, self).terminate() os.system('chmod -R go+rw /tmp/topotests') - def stopRouter(self, wait=True, assertOnError=True): + def stopRouter(self, wait=True, assertOnError=True, minErrorVersion='5.0'): # Stop Running Quagga or FRR Daemons rundaemons = self.cmd('ls -1 /var/run/%s/*.pid' % self.routertype) errors = "" @@ -595,6 +595,9 @@ class Router(Node): self.cmd('rm -- {}'.format(d.rstrip())) if wait: errors = self.checkRouterCores(reportOnce=True) + if self.checkRouterVersion('<', minErrorVersion): + #ignore errors in old versions + errors = "" if assertOnError and len(errors) > 0: assert "Errors found - details follow:" == 0, errors return errors -- 2.39.5