From nobody Tue Feb 10 16:22:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1524157468437356.0272936929101; Thu, 19 Apr 2018 10:04:28 -0700 (PDT) Received: from localhost ([::1]:60829 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9Cyw-0000c5-3o for importer@patchew.org; Thu, 19 Apr 2018 13:04:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33257) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9CiM-0003SO-Hd for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9CiI-0007Uu-OH for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:18 -0400 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:40308) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9CiI-0007Ud-Ji for qemu-devel@nongnu.org; Thu, 19 Apr 2018 12:47:14 -0400 Received: by mail-qk0-x243.google.com with SMTP id o64so5953555qkl.7 for ; Thu, 19 Apr 2018 09:47:14 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id k126sm3040039qkd.34.2018.04.19.09.47.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 09:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V1yp/fwmPFgtruWFq14dNjIBmPFZxd/OMxav2t59eFM=; b=h/XQNUMllhtaLx4EfK2UL9AfmS2Qn8teOrTaAUStLMXBMGXSIfA+7+I6gc+507I8fc XuRomV32JALYORlcTgoNoeR3ruCSyc9pQS84AK2gutzoYhSMUdOualejoxaMHdm5MdLy W3wqQYkXkPozYInIgO9lIX8ug9Uq88XDmLzbvJFYelg8X98hSW6/YohHi7zxGVJGf0Rs akLyHRhef+RDHdZXzGOpkP9DAUOS3gVcAomK/o3ReHsqPSKT/qwDGPOk8/zycPNGWU/R 3HAUmkVVXqn/1d6QeGYeP9l1qrd8TBtdSj9bHk4Lx6DFYvVlP+TInoFXnDUHohKrh3w5 finw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=V1yp/fwmPFgtruWFq14dNjIBmPFZxd/OMxav2t59eFM=; b=UpNwgQv9DOZ+fldY8jHu5znBZkAQ8W3K9kExq39wTw99KPYU78b7gq9421to8jEFfv 5xD2D6b6y3h4vh5tt4Wo04XB7Fm9eSYE5+0B8/xieiLJ1bb/y9UecCwHWtNSDWw7l4wm SjnYiGt7p5q8/JY7sC7D2pZGJQ/lxDFIUn8WIfuKV2KGPJsfeYQQbZIv0QouuLN+RffM NkdzIBMkzvAWi8kHUJ6bk1V9g7FbknFuxjQ0t24X1K/pk/1l78mflGIFv3B9FO8ETkOv JXBIFlDmVs4razempCIN4D0eGr4lMnxMbGzhqkO+meEqNNFmEEZyp9BEL+yKJpd+cgQR IaYg== X-Gm-Message-State: ALQs6tDuCFfHSytg6trCNnfVUrZwMNa6A8Mzsx8QCDASIhpAc1eVyUV0 nHERmW6mcHNe8uc7Z04ETgM= X-Google-Smtp-Source: AIpwx48LB4kSrtjbRNTvbOukV2/DQWdwW1vxiZqhZoWLTdEQDr9ateVRPoUq8dl+a43O/sy266/4Lg== X-Received: by 10.55.153.7 with SMTP id b7mr5166411qke.307.1524156434072; Thu, 19 Apr 2018 09:47:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Luk=C3=A1=C5=A1=20Doktor?= , Cleber Rosa , Amador Pahim , Stefan Hajnoczi , Zheng Xiang Date: Thu, 19 Apr 2018 13:46:40 -0300 Message-Id: <20180419164642.9536-6-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419164642.9536-1-f4bug@amsat.org> References: <20180419164642.9536-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [RFC PATCH 5/7] avocado: Add an optional flag 'login' to get_console() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Alistair Francis , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Not all consoles require users to log in :/ Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Cleber Rosa --- tests/avocado/avocado_qemu/test.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/tests/avocado/avocado_qemu/test.py b/tests/avocado/avocado_qem= u/test.py index 1ead917014..ac8ee6d250 100644 --- a/tests/avocado/avocado_qemu/test.py +++ b/tests/avocado/avocado_qemu/test.py @@ -244,7 +244,7 @@ class _VM(qemu.QEMUMachine): super(_VM, self).__init__(qemu_bin, name=3Dself.name, arch=3Darch) logging.getLogger('QMP').setLevel(logging.INFO) =20 - def get_console(self, console_address=3DNone, prompt=3Dr"[\#\$] "): + def get_console(self, console_address=3DNone, prompt=3Dr"[\#\$] ", log= in=3DTrue): """ :param address: Socket address, can be either a unix socket path (string) or a tuple in the form (address, port) @@ -252,9 +252,6 @@ class _VM(qemu.QEMUMachine): :param prompt: The regex to identify we reached the prompt. """ =20 - if not all((self.username, self.password)): - raise QEMULoginError('Username or password not set.') - if not self.is_running(): raise QEMULoginError('VM is not running.') =20 @@ -272,13 +269,17 @@ class _VM(qemu.QEMUMachine): nc_cmd +=3D ' -U %s' % console_address =20 console =3D aexpect.ShellSession(nc_cmd) - try: - logging.info('Console: Waiting login prompt...') - _handle_prompts(console, self.username, self.password, prompt) - logging.info('Console: Ready!') - except: - console.close() - raise + if login: + if not all((self.username, self.password)): + raise QEMULoginError('Username or password not set.') + + try: + logging.info('Console: Waiting login prompt...') + _handle_prompts(console, self.username, self.password, pro= mpt) + except: + console.close() + raise + logging.info('Console: Ready!') =20 return console =20 --=20 2.17.0