From nobody Fri Apr 4 10:28:09 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1590575794; cv=none; d=zohomail.com; s=zohoarc; b=UbeWE8GE0r0oPKThdqxqONlSJdYS0EPItQc/LyULob9Sus2po4Vi5texMxag4pXsU7w7zxIjlTSD1lZVX2dZ92g3a3Zxf/OUqHLX4k9lg3/Q18ye5gZZwlnkVeKQnrG9y1nB55pU2brXPVUbcmX0vcQCMyy2SAx7W5XjxxUxX1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1590575794; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=gzSA3T3D3bjUS+27t5Vd7zmn0tcQoGXycn9jKRemVzU=; b=L1xRLeufIJ43o6Uod/IgboHeVFOrArQvlDPN2Ny/g8dGYQevnbV8v+o2OFp8aOvH/JRLhm+v4sIm7yZoAR9MA/XVXl8kP8UsUXQB9FvU/hUfuATN5ts190WBwJTtUeH/X4UtveNXXCB5JfgWBt+7cblOOUxU9+VI+328D/dWd+s= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1590575794708359.7493363015251; Wed, 27 May 2020 03:36:34 -0700 (PDT) Received: from localhost ([::1]:36570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdtQH-0002kz-8S for importer@patchew.org; Wed, 27 May 2020 06:36:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jdtKg-0000ah-8y for qemu-devel@nongnu.org; Wed, 27 May 2020 06:30:46 -0400 Received: from mail.ispras.ru ([83.149.199.45]:33476) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jdtKf-0001dR-Dq for qemu-devel@nongnu.org; Wed, 27 May 2020 06:30:45 -0400 Received: from [127.0.1.1] (unknown [62.118.151.149]) by mail.ispras.ru (Postfix) with ESMTPSA id 6CD19CD463; Wed, 27 May 2020 13:30:44 +0300 (MSK) Subject: [PATCH v2 01/11] tests/acceptance: allow console interaction with specific VMs From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Wed, 27 May 2020 13:30:44 +0300 Message-ID: <159057544414.16818.6329438674514481731.stgit@pasha-ThinkPad-X280> In-Reply-To: <159057543840.16818.14393433996899521784.stgit@pasha-ThinkPad-X280> References: <159057543840.16818.14393433996899521784.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: softfail client-ip=83.149.199.45; envelope-from=Pavel.Dovgaluk@gmail.com; helo=mail.ispras.ru X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/27 06:30:39 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001, FORGED_GMAIL_RCVD=1, FREEMAIL_FROM=0.001, NML_ADSP_CUSTOM_MED=0.9, SPF_SOFTFAIL=0.665, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wrampazz@redhat.com, alex.bennee@linaro.org, dovgaluk@ispras.ru, pavel.dovgaluk@ispras.ru, crosa@redhat.com, pbonzini@redhat.com, philmd@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Console interaction in avocado scripts was possible only with single default VM. This patch modifies the function parameters to allow passing a specific VM as a parameter to interact with it. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Willian Rampazzo Reviewed-by: Alex Benn=C3=A9e --- 0 files changed diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_qemu/__init__.py index 59e7b4f763..77d1c1d9ff 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -69,13 +69,15 @@ def pick_default_qemu_bin(arch=3DNone): =20 =20 def _console_interaction(test, success_message, failure_message, - send_string, keep_sending=3DFalse): + send_string, keep_sending=3DFalse, vm=3DNone): assert not keep_sending or send_string - console =3D test.vm.console_socket.makefile() + if vm is None: + vm =3D test.vm + console =3D vm.console_socket.makefile() console_logger =3D logging.getLogger('console') while True: if send_string: - test.vm.console_socket.sendall(send_string.encode()) + vm.console_socket.sendall(send_string.encode()) if not keep_sending: send_string =3D None # send only once msg =3D console.readline().strip() @@ -115,7 +117,8 @@ def interrupt_interactive_console_until_pattern(test, s= uccess_message, _console_interaction(test, success_message, failure_message, interrupt_string, True) =20 -def wait_for_console_pattern(test, success_message, failure_message=3DNone= ): +def wait_for_console_pattern(test, success_message, failure_message=3DNone, + vm=3DNone): """ Waits for messages to appear on the console, while logging the content =20 @@ -125,7 +128,7 @@ def wait_for_console_pattern(test, success_message, fai= lure_message=3DNone): :param success_message: if this message appears, test succeeds :param failure_message: if this message appears, test fails """ - _console_interaction(test, success_message, failure_message, None) + _console_interaction(test, success_message, failure_message, None, vm= =3Dvm) =20 def exec_command_and_wait_for_pattern(test, command, success_message, failure_message=3DN= one):