From nobody Fri Dec 19 15:54:59 2025 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=1733938441; cv=none; d=zohomail.com; s=zohoarc; b=lBcSfCM2KB1F7LwHmi50N3HPnV7oDcajsW7nzRGNiPWjMVSybpi7cEnqn4NQUdPhZdAKBXI6DJxmacinaM7PvQj2kyAtCGK3rHszhnxnzDS0PQ0YshFYW6G6dyYejOZPX0FXPLiuH+PL3wXlhGRvFdzD6s//UE0R7bhMtxpkK2I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1733938441; 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=pFRZUnduo0mfXw0WSEjpBJNDUH2EtB314dtfKFV/3CQ=; b=Fz6yr6RNlSkXep1Y9mj2mUKwjTuHVbSoV/HGL5+FLqqMLz7cM3er0bqk4JTPS/dCfq8lXFMhIv8syaI5y1EBP3nIyL9JBMQnn2VV1rK+jWwtPFqxzRCY9JXFeIYcsXKGCYDKpiA8w1Z/waqhrvKNr58NcG1EuyAKTcQOMVOdhec= 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 1733938441087797.9097487666257; Wed, 11 Dec 2024 09:34:01 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tLQVH-0006mW-VB; Wed, 11 Dec 2024 12:28:04 -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 1tLQVB-0006ey-J9 for qemu-devel@nongnu.org; Wed, 11 Dec 2024 12:27:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tLQVA-0001D7-6v for qemu-devel@nongnu.org; Wed, 11 Dec 2024 12:27:57 -0500 Received: from mx-prod-mc-05.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-192-xRsZ9Q_xNP-NS7RI6Na3aQ-1; Wed, 11 Dec 2024 12:27:52 -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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 27F6719541BC; Wed, 11 Dec 2024 17:27:51 +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 F10861956052; Wed, 11 Dec 2024 17:27:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1733938075; 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=pFRZUnduo0mfXw0WSEjpBJNDUH2EtB314dtfKFV/3CQ=; b=gIAbSRIfLwusYwZKKPVXJVsLK+WAPSk2+scX1LxhG2ABcZMKmf9EgkRE5btWqOvRuGg+mE 5GoN6zFbZFbkKmRO3vufeXBNbSKxEHOFhVtEm7bi87npk1svbAUY9NkycI4WTSyRw8Vp6q 26aNdtBNhImSwly9yACYnxZR3g8KCWk= X-MC-Unique: xRsZ9Q_xNP-NS7RI6Na3aQ-1 X-Mimecast-MFC-AGG-ID: xRsZ9Q_xNP-NS7RI6Na3aQ From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH v2 20/31] tests/functional: let cpio_extract accept filenames Date: Wed, 11 Dec 2024 17:26:36 +0000 Message-ID: <20241211172648.2893097-21-berrange@redhat.com> In-Reply-To: <20241211172648.2893097-1-berrange@redhat.com> References: <20241211172648.2893097-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.133.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1733938442601116600 Currently cpio_extract differs from tar_extract/zip_extract in that it only allows a file-like object as input. Adapt it to also support filenames. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- tests/functional/qemu_test/archive.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/functional/qemu_test/archive.py b/tests/functional/qemu_= test/archive.py index a6fc97a557..bc448dee4a 100644 --- a/tests/functional/qemu_test/archive.py +++ b/tests/functional/qemu_test/archive.py @@ -8,7 +8,7 @@ # Thomas Huth =20 import os -import subprocess +from subprocess import check_call, run, DEVNULL import tarfile import zipfile =20 @@ -25,12 +25,18 @@ def tar_extract(archive, dest_dir, member=3DNone): else: tf.extractall(path=3Ddest_dir) =20 -def cpio_extract(cpio_handle, output_path): +def cpio_extract(archive, output_path): cwd =3D os.getcwd() os.chdir(output_path) - subprocess.run(['cpio', '-i'], - input=3Dcpio_handle.read(), - stderr=3Dsubprocess.DEVNULL) + # Not passing 'check=3DTrue' as cpio exits with non-zero + # status if the archive contains any device nodes :-( + if type(archive) =3D=3D str: + run(['cpio', '-i', '-F', archive], + stdout=3DDEVNULL, stderr=3DDEVNULL) + else: + run(['cpio', '-i'], + input=3Darchive.read(), + stdout=3DDEVNULL, stderr=3DDEVNULL) os.chdir(cwd) =20 def zip_extract(archive, dest_dir, member=3DNone): --=20 2.46.0