commit 7cc1a9ded55287b8f874e909491ebc3b39179cbb
author Zuul <zuul@review.opendev.org> Wed Jul 08 12:57:15 2020 +0000
committer Gerrit Code Review <review@openstack.org> Wed Jul 08 12:57:15 2020 +0000
tree 076598651aca9735e2054a0b284bc35d80ab4217
parent b056ac25c90b4cd8459291f1eb12081b7ace304d
parent 3cd2e1aa7c15a10159b946554122cbdb348b41fa

Merge "Fix cert handling for dynamic routing tests"

neutron_tempest_plugin/scenario/base.py

diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py
index b441209..9223893 100644
--- a/neutron_tempest_plugin/scenario/base.py
+++ b/neutron_tempest_plugin/scenario/base.py
@@ -62,11 +62,10 @@
         'udp': udp, 'port': port}
     if msg:
         if CONF.neutron_plugin_options.default_image_is_advanced:
-            cmd += "-c 'echo %s' &" % msg
+            cmd += "-c 'echo %s' " % msg
         else:
-            cmd += "-e echo %s &" % msg
-    else:
-        cmd += "< /dev/zero &"
+            cmd += "-e echo %s " % msg
+    cmd += "< /dev/zero &{0}sleep 0.1{0}".format('\n')
     return cmd
 
 
@@ -497,7 +496,7 @@
         try:
             return ssh_client.execute_script(
                 get_ncat_server_cmd(port, protocol, echo_msg),
-                become_root=True)
+                become_root=True, combine_stderr=True)
         except lib_exc.SSHTimeout as ssh_e:
             LOG.debug(ssh_e)
             self._log_console_output(servers)