From nobody Fri Dec 27 02:08:30 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=1732901608; cv=none; d=zohomail.com; s=zohoarc; b=KBq0eJwU0jJRZ7KyotIVxcdOROFef3Ryvyx4Mo/E1btHJTEoIwvVejrAE4hvdjn0HfjL1WeQumcA83L2RnTQs2nzCht13Oazrv5iPjUsixg/JOjx3MdZGK/IywPmtVRkOE+a4D+9HpBk72F23W+YRzKFoujjevs9a8XZmBOJA5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1732901608; 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=S8oE50Xln0OaQahu+eCywKCurnfiG7RmcFzVi0Nb7rE=; b=dpw000QWdRmnb/nFOPrj+f9FzBVHSlws5ejQhEbSw+0SzGaxnraiy5FUykVrnDbdzPxaoPoNRnCj4WI5Deu0oS8DviLsZkQHJ4Hl8P76wfDVqxBFAdLMUOjXjaWUp692MDS823iNym+tbpsbVN0JKZfQPuXkXQdtJmpT7qBwtVc= 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 1732901608385814.0628181161666; Fri, 29 Nov 2024 09:33:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tH4rO-0004rB-OR; Fri, 29 Nov 2024 12:32:54 -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 1tH4qs-0003xZ-93 for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:32:24 -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 1tH4qq-00016h-S6 for qemu-devel@nongnu.org; Fri, 29 Nov 2024 12:32:22 -0500 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-573--O_dXb2AN4uLJ9A1O1_j6w-1; Fri, 29 Nov 2024 12:32:17 -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-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A85031955D50; Fri, 29 Nov 2024 17:32:16 +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 7DE9A1955F41; Fri, 29 Nov 2024 17:32:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732901539; 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=S8oE50Xln0OaQahu+eCywKCurnfiG7RmcFzVi0Nb7rE=; b=gq3hGOOhuTTTLjeiif5AaFa6DUA6OZ4zxAC6HfOWPPmmOULg4269dcul+wD2IXk1O+Qod5 939fwAycJYdTcHwm2ljaCVUtRu0A/ef0OmjZ9oi70bGsbIm8tUFuPVwLKawzdNV7l3NTqL gAiYOx58KAwbxBE+HE4a+xgu+t9/jig= X-MC-Unique: -O_dXb2AN4uLJ9A1O1_j6w-1 X-Mimecast-MFC-AGG-ID: -O_dXb2AN4uLJ9A1O1_j6w 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 20/22] tests/functional: generalize uncompress Date: Fri, 29 Nov 2024 17:31:18 +0000 Message-ID: <20241129173120.761728-21-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: 1732901608690019100 There are many types of compression that the tests deal with, and it makes sense to have a single helper 'uncompress' that can deal with all. Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/functional/qemu_test/utils.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/functional/qemu_test/utils.py b/tests/functional/qemu_te= st/utils.py index 8c1df8f8c2..90c87b3671 100644 --- a/tests/functional/qemu_test/utils.py +++ b/tests/functional/qemu_test/utils.py @@ -115,6 +115,23 @@ def lzma_uncompress(xz_path, output_path): os.remove(output_path) raise =20 +def uncompress(input_path, output_path, format=3DNone): + if format =3D=3D "xz": + lzma_uncompress(input_path, output_path) + elif format =3D=3D "gz": + gzip_uncompress(input_path, output_path) + else: + raise Exception(f"Unknown compression format {format}") + +def guess_uncompress_format(path): + (name, ext) =3D os.path.splitext(path) + if ext =3D=3D ".xz": + return "xz" + elif ext =3D=3D ".gz": + return "gz" + else: + raise Exception(f"Unknown compression format for {path}") + def cpio_extract(cpio_handle, output_path): cwd =3D os.getcwd() os.chdir(output_path) --=20 2.46.0