summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordongwenjuan <dong.wenjuan@zte.com.cn>2017-10-16 20:04:01 +0800
committerdongwenjuan <dong.wenjuan@zte.com.cn>2017-10-16 20:04:01 +0800
commitaa16cb3987bad7abfb8743cb205980a50d5f12fe (patch)
tree4b1b1f4ea2cf2098bbb1bd1d78fd81bf3297d530
parentff43740199fc14ad01b05ed0d626f51f81eb82f2 (diff)
fix the bug for consumer don't receive the notification
There is no 'sudo' command in functest container, so the stunnel is setup failed. Change-Id: I9e317c0643a370fb5b35d90363b0ff734a77c040 Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>
-rw-r--r--doctor_tests/installer/apex.py2
-rw-r--r--doctor_tests/scenario/common.py2
2 files changed, 1 insertions, 3 deletions
diff --git a/doctor_tests/installer/apex.py b/doctor_tests/installer/apex.py
index b64a366..16f0376 100644
--- a/doctor_tests/installer/apex.py
+++ b/doctor_tests/installer/apex.py
@@ -93,7 +93,7 @@ class ApexInstaller(BaseInstaller):
def setup_stunnel(self):
self.log.info('Setup ssh stunnel in controller nodes in Apex installer......')
for node_ip in self.controllers:
- cmd = "sudo ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s %s@%s -R %s:localhost:%s sleep 600 > ssh_tunnel.%s.log 2>&1 < /dev/null &" \
+ cmd = "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i %s %s@%s -R %s:localhost:%s sleep 600 > ssh_tunnel.%s.log 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)
diff --git a/doctor_tests/scenario/common.py b/doctor_tests/scenario/common.py
index ebf0cf5..a7240c0 100644
--- a/doctor_tests/scenario/common.py
+++ b/doctor_tests/scenario/common.py
@@ -6,8 +6,6 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import os
-
from doctor_tests.common.utils import match_rep_in_file