From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jason Wang Subject: [PATCH v2 03/10] KVM test: Make the login re suitable for serial console Date: Tue, 11 May 2010 17:03:34 +0800 Message-ID: <20100511090334.19914.45899.stgit@localhost.localdomain> References: <20100511083338.19914.7719.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: lmr@redhat.com, autotest@test.kernel.org Return-path: In-Reply-To: <20100511083338.19914.7719.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 Current matching re ^\s*[Ll]ogin:\s*$ is not suitable for the serial console, so change it to [Ll]ogin:\s*$. Signed-off-by: Jason Wang --- 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 2800fae..5cb3efb 100644 --- a/client/tests/kvm/kvm_utils.py +++ b/client/tests/kvm/kvm_utils.py @@ -489,7 +489,7 @@ def remote_login(command, username, 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:\s*$", r"[Cc]onnection.*closed", r"[Cc]onnection.*refused", r"[Pp]lease wait", prompt], timeout=timeout, internal_timeout=0.5)