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

topotests: remove daemons start up sleep

Browse Source 
Instead of waiting for daemons start with `sleep`, start them with the
`-d` parameter so they can release the terminal themselves when ready.

Signed-off-by: Rafael Zalamena <rzalamena@opensourcerouting.org>
This commit is contained in:
Rafael Zalamena 2020-07-02 14:51:37 -03:00
parent 1455684740
commit 9ce4f4b86b
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1188,13 +1188,11 @@ class Router(Node):
zebra_path = os.path.join(self.daemondir, "zebra") zebra_path = os.path.join(self.daemondir, "zebra")
zebra_option = self.daemons_options["zebra"] zebra_option = self.daemons_options["zebra"]
self.cmd( self.cmd(
"{0} {1} --log stdout --log-level debug > zebra.out 2> zebra.err &".format( "{0} {1} --log stdout --log-level debug -d > zebra.out 2> zebra.err".format(
zebra_path, zebra_option, self.logdir, self.name zebra_path, zebra_option, self.logdir, self.name
) )
) )
self.waitOutput()
logger.debug("{}: {} zebra started".format(self, self.routertype)) logger.debug("{}: {} zebra started".format(self, self.routertype))
sleep(1, "{}: waiting for zebra to start".format(self.name))
# Remove `zebra` so we don't attempt to start it again. # Remove `zebra` so we don't attempt to start it again.
daemons_list.remove('zebra') daemons_list.remove('zebra')
@ -1204,11 +1202,10 @@ class Router(Node):
staticd_path = os.path.join(self.daemondir, "staticd") staticd_path = os.path.join(self.daemondir, "staticd")
staticd_option = self.daemons_options["staticd"] staticd_option = self.daemons_options["staticd"]
self.cmd( self.cmd(
"{0} {1} --log stdout --log-level debug > staticd.out 2> staticd.err &".format( "{0} {1} --log stdout --log-level debug -d > staticd.out 2> staticd.err".format(
staticd_path, staticd_option, self.logdir, self.name staticd_path, staticd_option, self.logdir, self.name
) )
) )
self.waitOutput()
logger.debug("{}: {} staticd started".format(self, self.routertype)) logger.debug("{}: {} staticd started".format(self, self.routertype))
# Remove `staticd` so we don't attempt to start it again. # Remove `staticd` so we don't attempt to start it again.
@ -1228,11 +1225,10 @@ class Router(Node):
daemon_path = os.path.join(self.daemondir, daemon) daemon_path = os.path.join(self.daemondir, daemon)
self.cmd( self.cmd(
"{0} {1} --log stdout --log-level debug > {2}.out 2> {2}.err &".format( "{0} {1} --log stdout --log-level debug -d > {2}.out 2> {2}.err".format(
daemon_path, self.daemons_options.get(daemon, ""), daemon daemon_path, self.daemons_options.get(daemon, ""), daemon
) )
) )
self.waitOutput()
logger.debug("{}: {} {} started".format(self, self.routertype, daemon)) logger.debug("{}: {} {} started".format(self, self.routertype, daemon))
# Check if daemons are running. # Check if daemons are running.