diff options
Diffstat (limited to 'tests/topotests/lib/topotest.py')
| -rw-r--r-- | tests/topotests/lib/topotest.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py index b98698185c..6be644ac00 100644 --- a/tests/topotests/lib/topotest.py +++ b/tests/topotests/lib/topotest.py @@ -1386,7 +1386,6 @@ class Router(Node): if params.get("routertype") is not None: self.routertype = params.get("routertype") - self.cmd("ulimit -c unlimited") # Set ownership of config files self.cmd("chown {0}:{0}vty /etc/{0}".format(self.routertype)) @@ -1445,7 +1444,7 @@ class Router(Node): running = self.listDaemons() if running: - for _ in range(0, 5): + for _ in range(0, 30): sleep( 0.5, "{}: waiting for daemons stopping: {}".format( @@ -1725,7 +1724,7 @@ class Router(Node): ) if valgrind_extra: cmdenv += ( - "--gen-suppressions=all --expensive-definedness-checks=yes" + " --gen-suppressions=all --expensive-definedness-checks=yes" ) elif daemon in strace_daemons or "all" in strace_daemons: cmdenv = "strace -f -D -o {1}/{2}.strace.{0} ".format( @@ -1860,7 +1859,7 @@ class Router(Node): self.cmd("kill -9 %s" % daemonpid) if pid_exists(int(daemonpid)): numRunning += 1 - if wait and numRunning > 0: + while wait and numRunning > 0: sleep( 2, "{}: waiting for {} daemon to be stopped".format( @@ -1884,7 +1883,11 @@ class Router(Node): ) ) self.cmd("kill -9 %s" % daemonpid) - self.cmd("rm -- {}".format(d.rstrip())) + if daemonpid.isdigit() and not pid_exists( + int(daemonpid) + ): + numRunning -= 1 + self.cmd("rm -- {}".format(d.rstrip())) if wait: errors = self.checkRouterCores(reportOnce=True) if self.checkRouterVersion("<", minErrorVersion): |