From: Yulong Pei <yulong.pei@intel.com>
Date: Tue, 7 Aug 2018 10:37:18 +0000 (+0800)
Subject: add the expected prompt for ubuntu root user
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=7afd133d67400a062b0d3ae2ecf8b6ab380077fe

add the expected prompt for ubuntu root user

if ssh use root account to login ubuntu os, its prompt is ":~# ",
so add it to let csit test can run with root account.

Change-Id: I21f5380245324c8e48099433e3d374188e9001d9
Signed-off-by: Yulong Pei <yulong.pei@intel.com>
---

diff --git a/resources/libraries/python/VatExecutor.py b/resources/libraries/python/VatExecutor.py
index 8c3805c5c3..30aac2d417 100644
--- a/resources/libraries/python/VatExecutor.py
+++ b/resources/libraries/python/VatExecutor.py
@@ -201,7 +201,7 @@ class VatTerminal(object):
     """
 
     __VAT_PROMPT = ("vat# ", )
-    __LINUX_PROMPT = (":~$ ", "~]$ ", "~]# ")
+    __LINUX_PROMPT = (":~# ", ":~$ ", "~]$ ", "~]# ")
 
     def __init__(self, node, json_param=True):
         json_text = ' json' if json_param else ''
@@ -345,4 +345,4 @@ class VatTerminal(object):
         for line_tmpl in cmd_template:
             vat_cmd = line_tmpl.format(**args)
             ret.append(self.vat_terminal_exec_cmd(vat_cmd.replace('\n', '')))
-        return ret
\ No newline at end of file
+        return ret
diff --git a/resources/libraries/python/ssh.py b/resources/libraries/python/ssh.py
index 7518cabcc3..7368c6980a 100644
--- a/resources/libraries/python/ssh.py
+++ b/resources/libraries/python/ssh.py
@@ -264,7 +264,7 @@ class SSH(object):
         chan.set_combine_stderr(True)
 
         buf = ''
-        while not buf.endswith((":~$ ", "~]$ ", "~]# ")):
+        while not buf.endswith((":~# ", ":~$ ", "~]$ ", "~]# ")):
             try:
                 chunk = chan.recv(self.__MAX_RECV_BUF)
                 if not chunk: