From 9ce4f4b86b94d7931affed71b2d1363cd86b34c8 Mon Sep 17 00:00:00 2001
From: Rafael Zalamena <rzalamena@opensourcerouting.org>
Date: Thu, 2 Jul 2020 14:51:37 -0300
Subject: [PATCH] topotests: remove daemons start up sleep

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>
---
 tests/topotests/lib/topotest.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 0fe3f463a5..f8f62f9d50 100644
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -1188,13 +1188,11 @@ class Router(Node):
             zebra_path = os.path.join(self.daemondir, "zebra")
             zebra_option = self.daemons_options["zebra"]
             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
                 )
             )
-            self.waitOutput()
             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.
             daemons_list.remove('zebra')
@@ -1204,11 +1202,10 @@ class Router(Node):
             staticd_path = os.path.join(self.daemondir, "staticd")
             staticd_option = self.daemons_options["staticd"]
             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
                 )
             )
-            self.waitOutput()
             logger.debug("{}: {} staticd started".format(self, self.routertype))
 
             # 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)
             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
                 )
             )
-            self.waitOutput()
             logger.debug("{}: {} {} started".format(self, self.routertype, daemon))
 
         # Check if daemons are running.