From nobody Sat Dec 28 10:52:09 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=1734451816; cv=none; d=zohomail.com; s=zohoarc; b=UHe+FCPsAMEryh4Rex8BaUp475fR3r8DAZnjDJJTMjguhQ+JGC9FqYwGSpDneS9jsZa3yAF2quWXEKfwib215hz+T69Pg1eo4CK3cWV9B8hIu5MVPJbx4ooITJUoYxm9eX6QbZljjaQtRouDKWfMEvuZ0XeNqy3VZ470zOm/jsg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1734451816; 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=Br+ai5bGjWpU1X9MgHS3GJ2Q1rZhPbkDQDewh0iUynU=; b=LwYZ2gF+ZYpvfWEYqBDtfdLimY2JuHf6f/ZImnA2jAKuAzx4yvEtrcv7le3SEaXW5MUf3B5GD7HTUNGfvyRGVDDgjPf8U6O8zTMOkj4ZEYoakiqI6D4jCRVTJnXxKdrbcR+AwkXv/FY4dXGsuZ54AJSElk//NGCFE/Y8+xt1VuI= 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 17344518163151001.7865943389119; Tue, 17 Dec 2024 08:10:16 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tNa0g-0005FC-GR; Tue, 17 Dec 2024 11:01:22 -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 1tNa0Q-0004VI-RB for qemu-devel@nongnu.org; Tue, 17 Dec 2024 11:01:08 -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 1tNa0O-0002BZ-OH for qemu-devel@nongnu.org; Tue, 17 Dec 2024 11:01:05 -0500 Received: from mx-prod-mc-02.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-75-hR7MuDhFPdyxuzKYSFBuTg-1; Tue, 17 Dec 2024 11:01:00 -0500 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 1C5D91956051; Tue, 17 Dec 2024 16:00:59 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.136]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id DF00A30044C1; Tue, 17 Dec 2024 16:00:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734451263; 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=Br+ai5bGjWpU1X9MgHS3GJ2Q1rZhPbkDQDewh0iUynU=; b=E0W4DJqCrzhpJIjOtEfacOuqCmWrpgOGngiIUSH7+kawSTVftwk9CcOMUrOnDtvhU7WTFS ohF52PUEYm7TOOXyw05hEzzD6Q8n9nKIhf81xRqdnRMz9t9eZOWCi51EuyuVnWN4ixMuNw EzdynO0/fSffC4uNalpz4wvXH/en5/0= X-MC-Unique: hR7MuDhFPdyxuzKYSFBuTg-1 X-Mimecast-MFC-AGG-ID: hR7MuDhFPdyxuzKYSFBuTg From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH v3 20/32] tests/functional: let cpio_extract accept filenames Date: Tue, 17 Dec 2024 15:59:41 +0000 Message-ID: <20241217155953.3950506-21-berrange@redhat.com> In-Reply-To: <20241217155953.3950506-1-berrange@redhat.com> References: <20241217155953.3950506-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.4.1 on 10.30.177.4 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: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 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=-1.116, 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: 1734451818421116600 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. Reviewed-by: Thomas Huth Signed-off-by: Daniel P. Berrang=C3=A9 --- 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