From patchwork Thu Jan 30 19:27:12 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 13954922 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3C081C0218A for ; Thu, 30 Jan 2025 19:27:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tdaCH-00089f-J9; Thu, 30 Jan 2025 14:27:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tdaCF-00088m-Ag for qemu-devel@nongnu.org; Thu, 30 Jan 2025 14:27:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tdaCD-0006eT-Km for qemu-devel@nongnu.org; Thu, 30 Jan 2025 14:27:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738265244; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=6Nj0T4EbimJw7EMC9hJk0J+3ooqvm/dFNievURN/Cts=; b=JjoCx1Jc/geMynFxjjBtBpHln7ZflTJDhat0rxiUCU2kA/sND0/t45gpSBxUNQBN65rh0i bKkjz8cZFr2qFvA3lGLvDKAC/zJu9uNlRrTyS3j+RZhpNi1LbXeNb5hfzO4EMMEmy32Jym tV9iJW6ucP8zIFynWuya1fWy6iKwgsg= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-635-C_EaKC6rO4aGtANmmma2Kw-1; Thu, 30 Jan 2025 14:27:19 -0500 X-MC-Unique: C_EaKC6rO4aGtANmmma2Kw-1 X-Mimecast-MFC-AGG-ID: C_EaKC6rO4aGtANmmma2Kw Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7E3BA19560BB for ; Thu, 30 Jan 2025 19:27:18 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.19]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A1BDE180094D; Thu, 30 Jan 2025 19:27:16 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , =?utf-8?q?Daniel_P_=2E_Berrang?= =?utf-8?q?=C3=A9?= , Thomas Huth Subject: [PATCH] tests/functional: Convert the hotplug_blk avocado test Date: Thu, 30 Jan 2025 20:27:12 +0100 Message-ID: <20250130192712.19542-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.3, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org By using the serial console instead of ssh for executing commands in the guest, we can convert this test to the functional framework. Signed-off-by: Thomas Huth Reviewed-by: Daniel P. Berrangé --- MAINTAINERS | 1 + tests/functional/meson.build | 1 + .../test_x86_64_hotplug_blk.py} | 50 ++++++++++++------- 3 files changed, 35 insertions(+), 17 deletions(-) rename tests/{avocado/hotplug_blk.py => functional/test_x86_64_hotplug_blk.py} (47%) mode change 100644 => 100755 diff --git a/MAINTAINERS b/MAINTAINERS index 414b6f35fe..1aa519da57 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2273,6 +2273,7 @@ F: hw/block/virtio-blk.c F: hw/block/dataplane/* F: include/hw/virtio/virtio-blk-common.h F: tests/qtest/virtio-blk-test.c +F: tests/functional/test_x86_64_hotplug_blk.py T: git https://github.com/stefanha/qemu.git block virtio-ccw diff --git a/tests/functional/meson.build b/tests/functional/meson.build index 257c7e8182..a14e10124b 100644 --- a/tests/functional/meson.build +++ b/tests/functional/meson.build @@ -283,6 +283,7 @@ tests_x86_64_system_thorough = [ 'multiprocess', 'netdev_ethtool', 'virtio_gpu', + 'x86_64_hotplug_blk', 'x86_64_hotplug_cpu', 'x86_64_kvm_xen', 'x86_64_tuxrun', diff --git a/tests/avocado/hotplug_blk.py b/tests/functional/test_x86_64_hotplug_blk.py old mode 100644 new mode 100755 similarity index 47% rename from tests/avocado/hotplug_blk.py rename to tests/functional/test_x86_64_hotplug_blk.py index b36bca02ec..7ddbfefc21 --- a/tests/avocado/hotplug_blk.py +++ b/tests/functional/test_x86_64_hotplug_blk.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python3 +# # Functional test that hotplugs a virtio blk disk and checks it on a Linux # guest # @@ -7,12 +9,21 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. -import time +from qemu_test import LinuxKernelTest, Asset, exec_command_and_wait_for_pattern + -from avocado_qemu.linuxtest import LinuxTest +class HotPlugBlk(LinuxKernelTest): + ASSET_KERNEL = Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux/releases' + '/31/Server/x86_64/os/images/pxeboot/vmlinuz'), + 'd4738d03dbbe083ca610d0821d0a8f1488bebbdccef54ce33e3adb35fda00129') + + ASSET_INITRD = Asset( + ('https://archives.fedoraproject.org/pub/archive/fedora/linux/releases' + '/31/Server/x86_64/os/images/pxeboot/initrd.img'), + '277cd6c7adf77c7e63d73bbb2cded8ef9e2d3a2f100000e92ff1f8396513cd8b') -class HotPlug(LinuxTest): def blockdev_add(self) -> None: self.vm.cmd('blockdev-add', **{ 'driver': 'null-co', @@ -21,11 +32,12 @@ def blockdev_add(self) -> None: }) def assert_vda(self) -> None: - self.ssh_command('test -e /sys/block/vda') + exec_command_and_wait_for_pattern(self, 'while ! test -e /sys/block/vda ;' + ' do sleep 0.2 ; done', '# ') def assert_no_vda(self) -> None: - with self.assertRaises(AssertionError): - self.assert_vda() + exec_command_and_wait_for_pattern(self, 'while test -e /sys/block/vda ;' + ' do sleep 0.2 ; done', '# ') def plug(self) -> None: args = { @@ -38,11 +50,8 @@ def plug(self) -> None: self.assert_no_vda() self.vm.cmd('device_add', args) - try: - self.assert_vda() - except AssertionError: - time.sleep(1) - self.assert_vda() + self.wait_for_console_pattern('virtio_blk virtio0: [vda]') + self.assert_vda() def unplug(self) -> None: self.vm.cmd('device_del', id='virtio-disk0') @@ -53,17 +62,24 @@ def unplug(self) -> None: self.assert_no_vda() def test(self) -> None: - """ - :avocado: tags=arch:x86_64 - :avocado: tags=machine:q35 - :avocado: tags=accel:kvm - """ self.require_accelerator('kvm') + self.set_machine('q35') + self.vm.add_args('-accel', 'kvm') self.vm.add_args('-device', 'pcie-pci-bridge,id=pci.1,bus=pcie.0') + self.vm.add_args('-m', '1G') + self.vm.add_args('-append', 'console=ttyS0 rd.rescue') + + self.launch_kernel(self.ASSET_KERNEL.fetch(), + self.ASSET_INITRD.fetch(), + wait_for='Entering emergency mode.') + self.wait_for_console_pattern('# ') - self.launch_and_wait() self.blockdev_add() self.plug() self.unplug() + + +if __name__ == '__main__': + LinuxKernelTest.main()