topotest: remove pid files

Remove PID files after a SIGKILL or confirmation that the pid file no
longer contains a running PID.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2017-12-08 12:41:35 -02:00 committed by Donald Sharp
parent 065bd557f8
commit e600b2d93c

View File

@ -537,6 +537,8 @@ class Router(Node):
def stopRouter(self, wait=True):
# Stop Running Quagga or FRR Daemons
rundaemons = self.cmd('ls -1 /var/run/%s/*.pid' % self.routertype)
if re.search(r"No such file or directory", rundaemons):
return
if rundaemons is not None:
numRunning = 0
for d in StringIO.StringIO(rundaemons):
@ -562,6 +564,7 @@ class Router(Node):
))
self.cmd('kill -7 %s' % daemonpid)
self.waitOutput()
self.cmd('rm -- {}'.format(d.rstrip()))
def removeIPs(self):
for interface in self.intfNames():
self.cmd('ip address flush', interface)