From: Jason Wang <jasowang@redhat.com>
To: lmr@redhat.com, autotest@test.kernel.org
Cc: kvm@vger.kernel.org
Subject: [PATCH v2 01/10] KVM test: Introduce prompt assist
Date: Tue, 11 May 2010 17:03:18 +0800 [thread overview]
Message-ID: <20100511090318.19914.90598.stgit@localhost.localdomain> (raw)
In-Reply-To: <20100511083338.19914.7719.stgit@localhost.localdomain>
We need to send an assist string to a session in order to get the
prompt when re-connecting to session through serial. This patch sends
assist string before matching the prompt in remote_login().
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
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..11f2b1a 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)
-
+ @param 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*$",
next prev parent reply other threads:[~2010-05-11 8:58 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-11 9:03 [PATCH v2 00/10] Redirct and make use of the guest serial console Jason Wang
2010-05-11 9:03 ` Jason Wang [this message]
2010-05-12 22:00 ` [PATCH v2 01/10] KVM test: Introduce prompt assist Lucas Meneghel Rodrigues
2010-05-11 9:03 ` [PATCH v2 02/10] KVM test: Send the username in remote_login() Jason Wang
2010-05-11 9:03 ` [PATCH v2 03/10] KVM test: Make the login re suitable for serial console Jason Wang
2010-05-11 9:03 ` [PATCH v2 04/10] KVM test: Redirect the serial to the unix domain socket Jason Wang
2010-05-11 9:03 ` [PATCH v2 05/10] KVM test: Log the content from guest serial console Jason Wang
2010-05-11 9:03 ` [PATCH v2 06/10] KVM test: Return none when met unknown type in kvm_vm.remote_login() Jason Wang
2010-05-11 9:04 ` [PATCH v2 07/10] KVM test: Introduce local_login() Jason Wang
2010-05-11 9:04 ` [PATCH v2 08/10] KVM test: Enable the serial console for all linux guests Jason Wang
2010-05-11 9:04 ` [PATCH v2 09/10] KVM test: Enable the serial console during unattended installation Jason Wang
2010-05-11 9:04 ` [PATCH v2 10/10] KVM test: Add a helper to search the panic in the log Jason Wang
2010-05-12 9:44 ` Michael Goldish
2010-05-17 7:28 ` Jason Wang
2010-05-17 21:23 ` Lucas Meneghel Rodrigues
2010-05-25 14:50 ` [PATCH v2 00/10] Redirct and make use of the guest serial console Lucas Meneghel Rodrigues
2010-05-28 8:19 ` Jason Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100511090318.19914.90598.stgit@localhost.localdomain \
--to=jasowang@redhat.com \
--cc=autotest@test.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=lmr@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).