From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Wang Subject: [PATCH 1/9] KVM test: Introduce the prompt assist Date: Mon, 26 Apr 2010 18:03:30 +0800 Message-ID: <20100426100330.26268.68794.stgit@localhost.localdomain> References: <20100426095656.26268.50549.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: autotest@test.kernel.org, lmr@redhat.com Return-path: In-Reply-To: <20100426095656.26268.50549.stgit@localhost.localdomain> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: autotest-bounces@test.kernel.org Errors-To: autotest-bounces@test.kernel.org List-Id: kvm.vger.kernel.org Sometimes we need to send an assist string to a session in order to get the prompt especially when re-connecting to an already logged serial session. This patch send the assist string before doing the pattern matching of remote_login. Signed-off-by: Jason Wang --- client/tests/kvm/kvm_utils.py | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/tests/kvm/kvm_utils.py b/client/tests/kvm/kvm_utils.py index 25f3c8c..9adbaee 100644 --- a/client/tests/kvm/kvm_utils.py +++ b/client/tests/kvm/kvm_utils.py @@ -451,7 +451,8 @@ def check_kvm_source_dir(source_dir): # The following are functions used for SSH, SCP and Telnet communication with # guests. -def remote_login(command, password, prompt, linesep="\n", timeout=10): +def remote_login(command, password, prompt, linesep="\n", timeout=10, + prompt_assist = None): """ Log into a remote host (guest) using SSH or Telnet. Run the given command using kvm_spawn and provide answers to the questions asked. If timeout @@ -468,7 +469,8 @@ def remote_login(command, password, prompt, linesep="\n", timeout=10): @param timeout: The maximal time duration (in seconds) to wait for each step of the login procedure (i.e. the "Are you sure" prompt, the password prompt, the shell prompt, etc) - + @prarm prompt_assist: An assistant string sent before the pattern + matching in order to get the prompt for some kinds of shell_client. @return Return the kvm_spawn object on success and None on failure. """ sub = kvm_subprocess.kvm_shell_session(command, @@ -479,6 +481,9 @@ def remote_login(command, password, prompt, linesep="\n", timeout=10): logging.debug("Trying to login with command '%s'" % command) + if prompt_assist is not None: + sub.sendline(prompt_assist) + while True: (match, text) = sub.read_until_last_line_matches( [r"[Aa]re you sure", r"[Pp]assword:\s*$", r"^\s*[Ll]ogin:\s*$",