From patchwork Mon Apr 26 10:03:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 95030 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o3Q9xSYM010296 for ; Mon, 26 Apr 2010 09:59:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753637Ab0DZJ7B (ORCPT ); Mon, 26 Apr 2010 05:59:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48962 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753315Ab0DZJ7A (ORCPT ); Mon, 26 Apr 2010 05:59:00 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q9wxYI019021 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 26 Apr 2010 05:58:59 -0400 Received: from localhost.localdomain ([10.66.91.25]) by int-mx05.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3Q9wvKm009711; Mon, 26 Apr 2010 05:58:57 -0400 Subject: [PATCH 3/9] KVM test: Make the login re suitable for serial console To: autotest@test.kernel.org, lmr@redhat.com From: Jason Wang Cc: kvm@vger.kernel.org Date: Mon, 26 Apr 2010 18:03:46 +0800 Message-ID: <20100426100346.26268.17314.stgit@localhost.localdomain> In-Reply-To: <20100426095656.26268.50549.stgit@localhost.localdomain> References: <20100426095656.26268.50549.stgit@localhost.localdomain> User-Agent: StGit/0.15 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.18 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 26 Apr 2010 09:59:30 +0000 (UTC) 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:", r"[Cc]onnection.*closed", r"[Cc]onnection.*refused", r"[Pp]lease wait", prompt], timeout=timeout, internal_timeout=0.5)