From: Lucas Meneghel Rodrigues <lmr@redhat.com>
To: Michael Goldish <mgoldish@redhat.com>
Cc: kvm@vger.kernel.org
Subject: Re: [KVM-AUTOTEST PATCH] kvm_utils.py: remote_login(): improve regular expression matching
Date: Fri, 29 May 2009 03:12:08 -0300 [thread overview]
Message-ID: <1243577528.2890.0.camel@localhost.localdomain> (raw)
In-Reply-To: <43f85767b32b927ca5e32abc5ded281915343656.1243179847.git.mgoldish@redhat.com>
On Sun, 2009-05-24 at 18:46 +0300, Michael Goldish wrote:
> 1. Make the 'login:' regular expression stricter so it doesn't match
> 'Last login: ...' messages.
> 2. Make the 'password:' regular expression stricter.
> 3. Handle 'Connection refused' messages.
Looks good to me
> Signed-off-by: Michael Goldish <mgoldish@redhat.com>
> ---
> client/tests/kvm_runtest_2/kvm_utils.py | 13 +++++++++----
> 1 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/client/tests/kvm_runtest_2/kvm_utils.py b/client/tests/kvm_runtest_2/kvm_utils.py
> index be8ad95..5736cf6 100644
> --- a/client/tests/kvm_runtest_2/kvm_utils.py
> +++ b/client/tests/kvm_runtest_2/kvm_utils.py
> @@ -413,7 +413,8 @@ def remote_login(command, password, prompt, linesep="\n", timeout=10):
>
> while True:
> (match, text) = sub.read_until_last_line_matches(
> - ["[Aa]re you sure", "[Pp]assword:", "[Ll]ogin:", "[Cc]onnection.*closed", prompt],
> + [r"[Aa]re you sure", r"[Pp]assword:\s*$", r"^\s*[Ll]ogin:\s*$",
> + r"[Cc]onnection.*closed", r"[Cc]onnection.*refused", prompt],
> timeout=timeout, internal_timeout=0.5)
> if match == 0: # "Are you sure you want to continue connecting"
> kvm_log.debug("Got 'Are you sure...'; sending 'yes'")
> @@ -437,11 +438,15 @@ def remote_login(command, password, prompt, linesep="\n", timeout=10):
> kvm_log.debug("Got 'Connection closed'")
> sub.close()
> return None
> - elif match == 4: # prompt
> + elif match == 4: # "Connection refused"
> + kvm_log.debug("Got 'Connection refused'")
> + sub.close()
> + return None
> + elif match == 5: # prompt
> kvm_log.debug("Got shell prompt -- logged in")
> return sub
> else: # match == None
> - kvm_log.debug("Timeout or process terminated")
> + kvm_log.debug("Timeout elapsed or process terminated")
> sub.close()
> return None
>
> @@ -470,7 +475,7 @@ def remote_scp(command, password, timeout=300, login_timeout=10):
>
> while True:
> (match, text) = sub.read_until_last_line_matches(
> - ["[Aa]re you sure", "[Pp]assword:", "lost connection"],
> + [r"[Aa]re you sure", r"[Pp]assword:\s*$", r"lost connection"],
> timeout=_timeout, internal_timeout=0.5)
> if match == 0: # "Are you sure you want to continue connecting"
> kvm_log.debug("Got 'Are you sure...'; sending 'yes'")
--
Lucas Meneghel Rodrigues
Software Engineer (QE)
Red Hat - Emerging Technologies
next prev parent reply other threads:[~2009-05-29 6:12 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-24 15:46 [KVM-AUTOTEST PATCH] RHEL-4.7 step files: fix the initial boot barriers Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] RHEL-5.3 step files: fix initial boot barriers and an inconsistent dialog Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] WinXP step files: add an optional barrier to deal with a closed start menu Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] stepeditor.py: get rid of some annoying keyboard shortcuts Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] Use new function VM.get_name() to get the VM's name, instead of VM.name Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] VM.create(): always destroy() the VM before attempting to start it Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] kvm_vm.py: choose a monitor filename in the constructor instead of VM.create() Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] kvm_vm.py: make sure the bulk of VM.create() is not executed in parallel Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] kvm_vm.py: add new function VM.clone() which returns a clone of the VM Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] kvm_utils.py: remote_login(): improve regular expression matching Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] kvm_vm.py: add new VM parameter 'x11_display' that controls $DISPLAY Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] kvm_runtest_2.py: use environment filename specified by the 'env' parameter Michael Goldish
2009-05-24 15:46 ` [KVM-AUTOTEST PATCH] kvm_runtest_2.py: use pickle instead of shelve when loading/saving env Michael Goldish
2009-05-28 13:26 ` Lucas Meneghel Rodrigues
2009-05-24 19:03 ` [KVM-AUTOTEST PATCH] kvm_runtest_2.py: use environment filename specified by the 'env' parameter sudhir kumar
2009-05-28 13:26 ` Lucas Meneghel Rodrigues
2009-05-28 13:26 ` [KVM-AUTOTEST PATCH] kvm_vm.py: add new VM parameter 'x11_display' that controls $DISPLAY Lucas Meneghel Rodrigues
2009-05-24 18:59 ` [KVM-AUTOTEST PATCH] kvm_utils.py: remote_login(): improve regular expression matching sudhir kumar
2009-05-29 6:12 ` Lucas Meneghel Rodrigues [this message]
2009-05-25 12:01 ` [KVM-AUTOTEST PATCH] kvm_vm.py: add new function VM.clone() which returns a clone of the VM Avi Kivity
2009-05-24 19:25 ` [KVM-AUTOTEST PATCH] kvm_vm.py: make sure the bulk of VM.create() is not executed in parallel sudhir kumar
2009-05-28 14:17 ` [KVM-AUTOTEST PATCH] VM.create(): always destroy() the VM before attempting to start it Lucas Meneghel Rodrigues
2009-05-28 13:06 ` [KVM-AUTOTEST PATCH] Use new function VM.get_name() to get the VM's name, instead of VM.name Lucas Meneghel Rodrigues
2009-06-03 5:01 ` Michael Goldish
2009-06-03 23:26 ` Lucas Meneghel Rodrigues
2009-05-24 19:31 ` [KVM-AUTOTEST PATCH] WinXP step files: add an optional barrier to deal with a closed start menu sudhir kumar
[not found] <1435179948.325591243240977150.JavaMail.root@zmail05.collab.prod.int.phx2.redhat.com>
2009-05-25 8:45 ` [KVM-AUTOTEST PATCH] kvm_utils.py: remote_login(): improve regular expression matching Michael Goldish
2009-05-26 8:35 ` sudhir kumar
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=1243577528.2890.0.camel@localhost.localdomain \
--to=lmr@redhat.com \
--cc=kvm@vger.kernel.org \
--cc=mgoldish@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.