From patchwork Wed Dec 11 17:26:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 13904029 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 D19BBE77180 for ; Wed, 11 Dec 2024 17:34:38 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLQUO-0005RJ-Cz; Wed, 11 Dec 2024 12:27:09 -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 1tLQUK-0005Qi-3A for qemu-devel@nongnu.org; Wed, 11 Dec 2024 12:27:05 -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 1tLQUF-000165-0l for qemu-devel@nongnu.org; Wed, 11 Dec 2024 12:27:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733938016; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vg7ouLRKRr5uTPGUap2HkSeDZDQ5P6j4KbeDqXlr1IU=; b=IBrarZGUdC86j/gaNN8LzeLkRSMF79t8gvb8ENwnsd5X6ZvgIxVLFEPXwwEXY9w8rAh4/G 1Zfh5KeGEjdIm42quXp6YACwQN9rkj3g1RAnrzNBAuvvhftgwMdpQz2xR4ZqCKHwb2q55K g42LIZM3fVZiXXDdwTWOT/YaeG3bmKU= Received: from mx-prod-mc-01.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-487-lRd5GZN9MG-de_wYDnC5ag-1; Wed, 11 Dec 2024 12:26:54 -0500 X-MC-Unique: lRd5GZN9MG-de_wYDnC5ag-1 X-Mimecast-MFC-AGG-ID: lRd5GZN9MG-de_wYDnC5ag Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8FF491955F40; Wed, 11 Dec 2024 17:26:52 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.49]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6E7501956048; Wed, 11 Dec 2024 17:26:49 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?A?= =?utf-8?q?lex_Benn=C3=A9e?= , Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= Subject: [PATCH v2 00/31] tests/functional: various improvements wrt assets/scratch files Date: Wed, 11 Dec 2024 17:26:16 +0000 Message-ID: <20241211172648.2893097-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.472, 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_H2=-0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_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 This series is an attempt to bring a little more guaranteed order to asset and scratch file handling in the functional tests. The main highlights are: * Add custom @skipXXXXX decorators for common scenarios present in QEMU tests * Add helpers for creating file paths for various well known types of data, or well known locations, to avoid adhoc path manipulation * Add helpers to simplify uncompressing and extracting archives, from files downloaded as assets The series overall has a neutral diffstat, but if you look at just test files, as opposed to the shared infra, you'll see a significant reduction of lines of code in the tests, and I believe its easier to read them with less boilerplate. This is based on: https://gitlab.com/thuth/qemu.git tags/pull-request-2024-12-11 Changes in v2: * Put archive & uncompress helpers in their own files * Have archive_extract & uncompress directly handle assets and format detection * Drop has_cmd/has_cmds helpers in favour of 'which' * Drop obsolete tessract version check * Simplify 'which' impl * Replace 'run_cmd' with direct use of subprocess * Remove even more unused imports * Gracefully handle asset download failure by skipping tests * Drop redundant hardcoded ./contrib path in virtio GPU test * Various docs improvements to decorators * Drop formatting change to import statements Daniel P. Berrangé (31): tests/functional: remove many unused imports tests/functional: resolve str(Asset) to cache file path tests/functional: remove duplicated 'which' function impl tests/functional: simplify 'which' implementation tests/functional: drop 'tesseract_available' helper tests/functional: introduce some helpful decorators tests/functional: switch to new test skip decorators tests/functional: drop 'has_cmd' and 'has_cmds' helpers tests/functional: add helpers for building file paths tests/functional: switch over to using self.log_file(...) tests/functional: switch over to using self.build_file(...) tests/functional: switch over to using self.data_file(...) tests/functional: switch over to using self.scratch_file() tests/functional: switch over to using self.socket_dir(...) tests/functional: remove redundant 'rmtree' call tests/functional: move archive handling into new archive.py file tests/functional: move uncompress handling into new uncompress.py file tests/functional: add common zip_extract helper tests/functional: add common deb_extract helper tests/functional: let cpio_extract accept filenames tests/functional: add a generalized archive_extract tests/functional: add 'archive_extract' to QemuBaseTest tests/functional: convert tests to new archive_extract helper tests/functional: add a generalized uncompress helper tests/functional: add 'uncompress' to QemuBaseTest tests/functional: convert tests to new uncompress helper tests/functional: drop back compat imports from utils.py tests/functional: replace 'run_cmd' with subprocess helpers tests/functional: remove now unused 'run_cmd' helper tests/functional: skip tests if assets are not available tests/functional: ignore errors when caching assets, except for 404 tests/functional/qemu_test/__init__.py | 9 +- tests/functional/qemu_test/archive.py | 117 ++++++++++ tests/functional/qemu_test/asset.py | 26 ++- tests/functional/qemu_test/cmd.py | 76 ++----- tests/functional/qemu_test/decorators.py | 107 +++++++++ tests/functional/qemu_test/linuxkernel.py | 30 +-- tests/functional/qemu_test/tesseract.py | 21 +- tests/functional/qemu_test/testcase.py | 205 ++++++++++++++++-- tests/functional/qemu_test/tuxruntest.py | 19 +- tests/functional/qemu_test/uncompress.py | 83 +++++++ tests/functional/qemu_test/utils.py | 45 ---- tests/functional/test_aarch64_aspeed.py | 23 +- tests/functional/test_aarch64_raspi3.py | 9 +- tests/functional/test_aarch64_raspi4.py | 21 +- tests/functional/test_aarch64_sbsaref.py | 12 +- .../functional/test_aarch64_sbsaref_alpine.py | 1 - .../test_aarch64_sbsaref_freebsd.py | 1 - tests/functional/test_aarch64_virt.py | 14 +- tests/functional/test_acpi_bits.py | 124 ++++------- tests/functional/test_alpha_clipper.py | 6 +- tests/functional/test_arm_aspeed.py | 46 ++-- tests/functional/test_arm_bflt.py | 13 +- tests/functional/test_arm_bpim2u.py | 44 ++-- tests/functional/test_arm_canona1100.py | 10 +- tests/functional/test_arm_collie.py | 2 +- tests/functional/test_arm_cubieboard.py | 40 ++-- tests/functional/test_arm_emcraft_sf2.py | 2 +- tests/functional/test_arm_integratorcp.py | 28 +-- tests/functional/test_arm_orangepi.py | 60 +++-- tests/functional/test_arm_raspi2.py | 21 +- tests/functional/test_arm_smdkc210.py | 18 +- tests/functional/test_arm_sx1.py | 2 +- tests/functional/test_arm_vexpress.py | 10 +- tests/functional/test_linux_initrd.py | 7 +- tests/functional/test_m68k_mcf5208evb.py | 8 +- tests/functional/test_m68k_nextcube.py | 24 +- tests/functional/test_m68k_q800.py | 5 +- .../functional/test_microblaze_s3adsp1800.py | 9 +- .../test_microblazeel_s3adsp1800.py | 10 +- tests/functional/test_mips64el_fuloong2e.py | 10 +- tests/functional/test_mips64el_loongson3v.py | 8 +- tests/functional/test_mips64el_malta.py | 45 ++-- tests/functional/test_mips_malta.py | 19 +- tests/functional/test_mipsel_malta.py | 24 +- tests/functional/test_or1k_sim.py | 7 +- tests/functional/test_ppc64_e500.py | 7 +- tests/functional/test_ppc64_hv.py | 39 +--- tests/functional/test_ppc64_tuxrun.py | 7 +- tests/functional/test_ppc_40p.py | 7 +- tests/functional/test_ppc_amiga.py | 20 +- tests/functional/test_ppc_bamboo.py | 15 +- tests/functional/test_ppc_mac.py | 8 +- tests/functional/test_ppc_mpc8544ds.py | 8 +- tests/functional/test_ppc_virtex_ml507.py | 10 +- tests/functional/test_rx_gdbsim.py | 13 +- tests/functional/test_s390x_ccw_virtio.py | 6 +- tests/functional/test_s390x_topology.py | 7 +- tests/functional/test_sh4_r2d.py | 14 +- tests/functional/test_sh4eb_r2d.py | 14 +- tests/functional/test_sparc64_sun4u.py | 11 +- tests/functional/test_sparc_sun4m.py | 7 +- tests/functional/test_virtio_gpu.py | 16 +- tests/functional/test_xtensa_lx60.py | 8 +- tests/lcitool/libvirt-ci | 2 +- 64 files changed, 885 insertions(+), 755 deletions(-) create mode 100644 tests/functional/qemu_test/archive.py create mode 100644 tests/functional/qemu_test/decorators.py create mode 100644 tests/functional/qemu_test/uncompress.py