Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
bugfix: kill the stunnel when cleanup
[doctor.git]
/
doctor_tests
/
installer
/
base.py
diff --git
a/doctor_tests/installer/base.py
b/doctor_tests/installer/base.py
index
f312130
..
f37b7f1
100644
(file)
--- 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"
" -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))
% (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)
self.servers.append(server)
- server.communicate()
def _get_ssh_key(self, client, key_path):
self.log.info('Get SSH keys from %s installer......'
def _get_ssh_key(self, client, key_path):
self.log.info('Get SSH keys from %s installer......'