From: Tomi Juvonen <tomi.juvonen@nokia.com>
Date: Thu, 9 Aug 2018 08:53:35 +0000 (+0000)
Subject: Merge "bugfix: kill the stunnel when cleanup"
X-Git-Tag: opnfv-7.0.0~8
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b2bb504032ac81a2ed3f404113b097d9ce3d7f14;hp=eaeb3c0f9dc9e6645a159d0a78b9fc181fce53d4;p=doctor.git

Merge "bugfix: kill the stunnel when cleanup"
---

diff --git a/doctor_tests/installer/base.py b/doctor_tests/installer/base.py
index f312130a..f37b7f1a 100644
--- a/doctor_tests/installer/base.py
+++ b/doctor_tests/installer/base.py
@@ -64,16 +64,15 @@ class BaseInstaller(object):
                    " -o StrictHostKeyChecking=no"
                    " -i %s %s@%s -R %s:localhost:%s"
                    " sleep 600 > ssh_tunnel.%s"
-                   " 2>&1 < /dev/null &"
+                   " 2>&1 < /dev/null "
                    % (self.key_file,
                       self.node_user_name,
                       node_ip,
                       self.conf.consumer.port,
                       self.conf.consumer.port,
                       node_ip))
-            server = subprocess.Popen(cmd, shell=True)
+            server = subprocess.Popen('exec ' + cmd, shell=True)
             self.servers.append(server)
-            server.communicate()
 
     def _get_ssh_key(self, client, key_path):
         self.log.info('Get SSH keys from %s installer......'