tests: Have zebra startup look for the zserv.api socket

Ensure that the zserv.api socket is actually up and running
before moving onto other daemons after zebra.

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
(cherry picked from commit 009f42dd5bd02eb5ee0bd9852704357c6bc7aaa1)

diff --git a/tests/topotests/lib/topotest.py b/tests/topotests/lib/topotest.py
index 301f245b17294e550b667f051ef6f0962e1ec905..07033698d0ece92e8406d75ee77d6ffa81acd809 100644 (file)
--- a/tests/topotests/lib/topotest.py
+++ b/tests/topotests/lib/topotest.py
@@ -1960,7 +1960,13 @@ class Router(Node):
                 )
             else:
                 binary = os.path.join(self.daemondir, daemon)
-                check_daemon_files.extend([runbase + ".pid", runbase + ".vty"])
+                if daemon == "zebra":
+                    zapi_base = "/var/run/{}/zserv.api".format(self.routertype)
+                    check_daemon_files.extend(
+                        [runbase + ".pid", runbase + ".vty", zapi_base]
+                    )
+                else:
+                    check_daemon_files.extend([runbase + ".pid", runbase + ".vty"])
 
                 cmdenv = "ASAN_OPTIONS="
                 if asan_abort: