From nobody Fri Dec 27 02:22:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1732901707; cv=none; d=zohomail.com; s=zohoarc; b=jX+/zACrlIdrwIohxBd91jSnWZA+8d3GH6iy9itmxQwc3/HEjoT2Ypww9cjwiTdDShUPo1miqEFB4CDqEIaZBTwR2OteHPGnkmxt+g+H+nxGP7g8hmqwssZMe7DH/vEJImgG1rG4WfFywGM1Ptk/7effUk9+3uO7ciwTmJStXs0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732901707; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=FCyAAhK263iWl5BFLtlHla09sTGKZa2FAEZ0CUv+p+s=; b=ZmxSSxPkamziolxdhxurVZ7mgT+nlSSNLBacbxCndGhhKw3o1kXpk+W+TxcRBHh7fvmTXs2mJliZPAaoP9Xol4p4qWVUnYd+Ekei1V8MIZ7jFVLzseKaPV7KuVWzImRtJjwlLn71xFAmsqpBDYYiBbmZfZmBw+hTa44K2vsf1wc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1732901707114161.66148586682255; Fri, 29 Nov 2024 09:35:07 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tH4rL-0004bR-4H; Fri, 29 Nov 2024 12:32:52 -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 1tH4ql-0003o6-O1 for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:32:18 -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 1tH4qk-00015E-3b for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:32:15 -0500 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-497-nKYGnbAdPb-pUqxjuLqY7w-1; Fri, 29 Nov 2024 12:32:11 -0500 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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E9F1D1955D93; Fri, 29 Nov 2024 17:32:10 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.37]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D78FF1955F41; Fri, 29 Nov 2024 17:32:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732901533; 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: in-reply-to:in-reply-to:references:references; bh=FCyAAhK263iWl5BFLtlHla09sTGKZa2FAEZ0CUv+p+s=; b=cdBwVf7CM03NphSMDNHM3DOngWYr/syMaZeC0MDizgCvA995ELDTC+PhJK3iBx1x/kE7Jp In8ved1fKvA+N6aPi9B3s6Dvzem9vcIxhcu4ynsT89Zzx1HtihQvYq7TRH1lg9DaCENxul 3PqI4pPMXw1N94aZJT0kw1o4D0fN0zw= X-MC-Unique: nKYGnbAdPb-pUqxjuLqY7w-1 X-Mimecast-MFC-AGG-ID: nKYGnbAdPb-pUqxjuLqY7w From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 18/22] tests/functional: add 'archive_extract' to QemuBaseTest Date: Fri, 29 Nov 2024 17:31:16 +0000 Message-ID: <20241129173120.761728-19-berrange@redhat.com> In-Reply-To: <20241129173120.761728-1-berrange@redhat.com> References: <20241129173120.761728-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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.93, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1732901709160019100 This helper wrappers utils.archive_extract, forcing the use of the scratch directory, to ensure any extracted files are cleaned at test termination. If a specific member is requested, then the path to the extracted file is also returned. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/functional/qemu_test/testcase.py | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu= _test/testcase.py index 2f32742387..31d06f0172 100644 --- a/tests/functional/qemu_test/testcase.py +++ b/tests/functional/qemu_test/testcase.py @@ -28,6 +28,8 @@ from .asset import Asset from .cmd import run_cmd from .config import BUILD_DIR +from .utils import (archive_extract as utils_archive_extract, + guess_archive_format) =20 =20 class QemuBaseTest(unittest.TestCase): @@ -39,6 +41,40 @@ class QemuBaseTest(unittest.TestCase): log =3D None logdir =3D None =20 + ''' + @params archive: filename, Asset, or file-like object to extract + @params sub_dir: optional sub-directory to extract into + @params member: optional member file to limit extraction to + + Extracts @archive into the scratch directory, or a + directory beneath named by @sub_dir. All files are + extracted unless @member specifies a limit. + + If @member is non-None, returns the fully qualified + path to @member + ''' + def archive_extract(self, archive, format=3DNone, sub_dir=3DNone, memb= er=3DNone): + if type(archive) =3D=3D Asset: + if format is None: + format =3D guess_archive_format(archive.url) + archive =3D archive.fetch() + elif format is None: + format =3D guess_archive_format(archive) + + if member is not None: + if os.path.isabs(member): + member =3D os.path.relpath(member, '/') + + if sub_dir is None: + utils_archive_extract(archive, self.scratch_file(), format, me= mber) + else: + utils_archive_extract(archive, self.scratch_file(sub_dir), + format, member) + + if member is not None: + return self.scratch_file(member) + return None + def socket_dir(self): if self.socketdir is None: self.socketdir =3D tempfile.TemporaryDirectory( --=20 2.46.0