From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by dpdk.org (Postfix) with ESMTP id E884658FA for ; Thu, 17 May 2018 12:31:18 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 217EB1435; Thu, 17 May 2018 03:31:18 -0700 (PDT) Received: from phil-VirtualBox.shanghai.arm.com (unknown [10.169.108.188]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 805183F25D; Thu, 17 May 2018 03:31:17 -0700 (PDT) From: Phil Yang To: dts@dpdk.org Cc: nd@arm.com, yong.liu@intel.com Date: Thu, 17 May 2018 18:31:04 +0800 Message-Id: <1526553064-19939-1-git-send-email-phil.yang@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526378779-10530-1-git-send-email-phil.yang@arm.com> References: <1526378779-10530-1-git-send-email-phil.yang@arm.com> Subject: [dts] [PATCH v2] framework/qemu_kvm: fix vm control session failure X-BeenThere: dts@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: test suite reviews and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 May 2018 10:31:19 -0000 Fix telnet socket vm control shell_reg mismatch issue. For socket vm control, added LOGIN_PROMPT into the login status check for other platform. Jira: ENTNET-773 Change-Id: I95fbb8b25563b706e6dc06217033d68aa3c76486 Signed-off-by: Phil Yang --- framework/qemu_kvm.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/qemu_kvm.py b/framework/qemu_kvm.py index ec33669..89518a7 100644 --- a/framework/qemu_kvm.py +++ b/framework/qemu_kvm.py @@ -979,7 +979,7 @@ class QEMUKvm(VirtBase): Connect to serial port and return connected session for usage if connected failed will return None """ - shell_reg = r"(\s*)\[(.*)\]# " + shell_reg = r"(.*)# " try: if getattr(self, 'control_session', None) is None: self.control_session = self.host_session @@ -1025,7 +1025,7 @@ class QEMUKvm(VirtBase): Connect to serial port and return connected session for usage if connected failed will return None """ - shell_reg = r"(\s*)\[(.*)\]# " + shell_reg = r"(.*)# " scan_cmd = "lsof -i:%d | grep telnet | awk '{print $2}'" % self.serial_port try: @@ -1058,7 +1058,7 @@ class QEMUKvm(VirtBase): return True # login into Redhat os, not sure can work on all distributions - if "x86_64 on an x86_64" not in out: + if ("x86_64 on an x86_64" not in out) and (self.LOGIN_PROMPT not in out): print RED("[%s:%s] not ready for login" % (self.host_dut.crb['My IP'], self.vm_name)) return False else: -- 2.7.4