On 04/26/2010 01:03 PM, Jason Wang wrote: > Current matching re ^\s*[Ll]ogin:\s*$ is not suitable for the serial > console, so change it to [Ll]ogin:. > > Signed-off-by: Jason Wang <jasowang@xxxxxxxxxx> > --- > client/tests/kvm/kvm_utils.py | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/client/tests/kvm/kvm_utils.py b/client/tests/kvm/kvm_utils.py > index 1ea0852..bb42314 100644 > --- a/client/tests/kvm/kvm_utils.py > +++ b/client/tests/kvm/kvm_utils.py > @@ -488,7 +488,7 @@ def remote_login(command, password, prompt, linesep="\n", timeout=10, > > while True: > (match, text) = sub.read_until_last_line_matches( > - [r"[Aa]re you sure", r"[Pp]assword:\s*$", r"^\s*[Ll]ogin:\s*$", > + [r"[Aa]re you sure", r"[Pp]assword:\s*$", r"[Ll]ogin:", This RE will also match "Last login: Wed Apr 28 14:07:28 2010 from localhost.localdomain" so we should probably settle for [Ll]ogin:\s*$. > r"[Cc]onnection.*closed", r"[Cc]onnection.*refused", > r"[Pp]lease wait", prompt], > timeout=timeout, internal_timeout=0.5) > > -- > To unsubscribe from this list: send the line "unsubscribe kvm" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
