From nobody Thu Sep 19 01:20:34 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=1721129429; cv=none; d=zohomail.com; s=zohoarc; b=kk9N0LyrMnttJl8WCHJo5m4rr69ubFUaPC4qcAVMfkdunvQYolfLBlp8VOvcS/gcKj/ar13DM+VcOjqeOIFHCcMD26DDTneTu8pzfROgHgxN1r/ZNbCZsZS/TBfE4//29xTa8BbQmYEJFpe+mLLGh/zEZO9ZU3yo0XBetZKNLus= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1721129429; h=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=XHN7AYgHuHljyH4exkRaU7dMz5pCsBSrCydjHlqdXLk=; b=ZkpqHXxya2nI/PzMNT5Vpfm1agkiva4+ovWWZS92iLwKQxkS7x56jgV0cqwKe3vKlmWQ2i0pteg35Rcayi3350G1NcNm+vWvPUt0Xzfl3ornCEtzvB2Tj3/7HaD021OHL4K4UWtx7XcSR4WtmVKP7Af+C8li9WV8UZfaA5gJDDg= 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 1721129429382238.82649991256005; Tue, 16 Jul 2024 04:30:29 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTgKW-0000eL-I0; Tue, 16 Jul 2024 07:26:48 -0400 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 1sTgKV-0000Z7-6C for qemu-devel@nongnu.org; Tue, 16 Jul 2024 07:26:47 -0400 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 1sTgKT-0003fB-OF for qemu-devel@nongnu.org; Tue, 16 Jul 2024 07:26:46 -0400 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-14--R4wowlLNDi4WVuRkOwxlw-1; Tue, 16 Jul 2024 07:26:41 -0400 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id A345E1944B25; Tue, 16 Jul 2024 11:26:40 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.154]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2A2B31955F40; Tue, 16 Jul 2024 11:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1721129205; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XHN7AYgHuHljyH4exkRaU7dMz5pCsBSrCydjHlqdXLk=; b=gSuD+2iN/cZXJcH2wgJCSaIFxP+WGI9d2dSUee4PDRbS0jVzlaGP/5v0M9T8hyDdVl2zbY wDwbDtL+OinA+JMZJrWyOFSnNcZUJgCgcEEYwj4Q3ic9hmB70ezN1iOSLVcztsbrJcVf28 qyHLcjqFCay7L9VhqEV4pGYZLKQxKlk= X-MC-Unique: -R4wowlLNDi4WVuRkOwxlw-1 From: Thomas Huth To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Cc: Ani Sinha , Richard Henderson , Paolo Bonzini , "Daniel P . Berrange" , John Snow , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Fabiano Rosas Subject: [PATCH 05/11] tests/functional: Implement fetch_asset() method for downloading assets Date: Tue, 16 Jul 2024 13:26:08 +0200 Message-ID: <20240716112614.1755692-6-thuth@redhat.com> In-Reply-To: <20240716112614.1755692-1-thuth@redhat.com> References: <20240716112614.1755692-1-thuth@redhat.com> MIME-Version: 1.0 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=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: 1721129429580116600 Content-Type: text/plain; charset="utf-8" In the new python test framework, we cannot use the fetch_asset() function from Avocado anymore, so we have to provide our own implementation now instead. Thus add such a function based on the urllib python module for this purpose. Signed-off-by: Thomas Huth --- tests/functional/qemu_test/__init__.py | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tests/functional/qemu_test/__init__.py b/tests/functional/qemu= _test/__init__.py index e73705d40a..77c3b14d34 100644 --- a/tests/functional/qemu_test/__init__.py +++ b/tests/functional/qemu_test/__init__.py @@ -11,6 +11,8 @@ # This work is licensed under the terms of the GNU GPL, version 2 or # later. See the COPYING file in the top-level directory. =20 +import hashlib +import urllib.request import logging import os import pycotap @@ -23,6 +25,7 @@ import unittest =20 from pathlib import Path +from shutil import copyfileobj from qemu.machine import QEMUMachine from qemu.utils import (get_info_usernet_hostfwd_port, kvm_available, tcg_available) @@ -215,6 +218,39 @@ def setUp(self, bin_prefix): if not os.path.exists(self.workdir): os.makedirs(self.workdir) =20 + def check_hash(self, file_name, expected_hash): + if not expected_hash: + return True + if len(expected_hash) =3D=3D 40: + sum_prog =3D 'sha1sum' + elif len(expected_hash) =3D=3D 64: + sum_prog =3D 'sha256sum' + elif len(expected_hash) =3D=3D 128: + sum_prog =3D 'sha512sum' + else: + raise Exception("unknown hash type") + checksum =3D subprocess.check_output([sum_prog, file_name]).split(= )[0] + return expected_hash =3D=3D checksum.decode("utf-8") + + def fetch_asset(self, url, asset_hash): + cache_dir =3D os.path.expanduser("~/.cache/qemu/download") + if not os.path.exists(cache_dir): + os.makedirs(cache_dir) + fname =3D os.path.join(cache_dir, + hashlib.sha256(url.encode("utf-8")).hexdigest= ()) + if os.path.exists(fname) and self.check_hash(fname, asset_hash): + return fname + self.log.info("Downloading %s to %s...", url, fname) + dl_fname =3D fname + ".download" + with urllib.request.urlopen(url) as src: + with open(dl_fname, "wb+") as dst: + copyfileobj(src, dst) + if not self.check_hash(dl_fname, asset_hash): + os.remove(dl_fname) + raise Exception("Hash of " + url + " does not match") + os.rename(dl_fname, fname) + return fname + def main(): tr =3D pycotap.TAPTestRunner(message_log =3D pycotap.LogMode.LogTo= Error, test_output_log =3D pycotap.LogMode.Log= ToError) --=20 2.45.2