{"id":2219804,"url":"http://patchwork.ozlabs.org/api/patches/2219804/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-7-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20260404140328.3724864-7-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-04T14:03:10","name":"[06/14] test: Convert test_efi_bootmgr to use FsHelper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"63a9eaef481ba219a3268437ae4294f66e57dae6","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-7-sjg@chromium.org/mbox/","series":[{"id":498729,"url":"http://patchwork.ozlabs.org/api/series/498729/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=498729","date":"2026-04-04T14:03:04","name":"test: Convert tests to use FsHelper and DiskHelper","version":1,"mbox":"http://patchwork.ozlabs.org/series/498729/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2219804/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219804/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256\n header.s=google header.b=i4eZLgRl;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;\n envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org)","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de","phobos.denx.de;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=chromium.org header.i=@chromium.org\n header.b=\"i4eZLgRl\";\n\tdkim-atps=neutral","phobos.denx.de;\n dmarc=pass (p=none dis=none) header.from=chromium.org","phobos.denx.de;\n spf=pass smtp.mailfrom=sjg@chromium.org"],"Received":["from phobos.denx.de (phobos.denx.de\n [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fny5b3Yn4z1yG2\n\tfor ; Sun, 05 Apr 2026 01:04:51 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 478CC84101;\n\tSat, 4 Apr 2026 16:04:09 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 3517780325; Sat, 4 Apr 2026 16:04:07 +0200 (CEST)","from mail-oa1-x35.google.com (mail-oa1-x35.google.com\n [IPv6:2001:4860:4864:20::35])\n (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits))\n (No client certificate requested)\n by phobos.denx.de (Postfix) with ESMTPS id 0F83C84020\n for ; Sat, 4 Apr 2026 16:04:05 +0200 (CEST)","by mail-oa1-x35.google.com with SMTP id\n 586e51a60fabf-40ea36b56b7so2226874fac.3\n for ; Sat, 04 Apr 2026 07:04:05 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 586e51a60fabf-4232eb3d0e4sm2348235fac.6.2026.04.04.07.04.01\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 04 Apr 2026 07:04:02 -0700 (PDT)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,\n DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,\n RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham\n autolearn_force=no version=3.4.2","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=chromium.org; s=google; t=1775311443; x=1775916243; darn=lists.denx.de;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=hqcYtr6SzE9QNvTzAXzmYoBRESuvyalgh5HvXZtNODA=;\n b=i4eZLgRlkzY7a6fQsUng0qB2p7cw1UMhPaAG8mG0watipPJM4Y99Hh1/uvDwRJ4OZP\n 2ikWKzPkosAp1s/7r3HzHm2WwcJUdf9cX4jFvqBSusc/xYePDYDxTu9Sooj7VqxO3g6E\n RdFQpuOiKVw3D45PFIl/JwwD/Vcb3auJw2Hsg=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775311443; x=1775916243;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=hqcYtr6SzE9QNvTzAXzmYoBRESuvyalgh5HvXZtNODA=;\n b=iKM3ac8npm8NjVb/Vq0nOwpc2r5SKKhF5n3Rnxb6szeONMTXqAZc7S8OwbVsWOMnPj\n aJBrTuBGygnriJgmwLNi1n/nUKi3w53gzlg6RvPL+hp1XJrVr+VpkMiQ5ohICCucXqQu\n N+szi1xOXr2u9kGl2vyR/9PrASBnthkwQjhrrm9sjACjxeGhurZOPs6HsDcPTIgA8lOr\n B/slKIuYNJgnk8oJL8aeZckBoGdAnwnqbmzL1DIOCku4WsSfOYnDRXBegFcgSYpjcrfT\n R1meHCvAXE2K6dyWVep8G1M8HkambpByAI4iY/ibAUsR+KGoxyrcQwH3J99unHuut83V\n 4NwQ==","X-Gm-Message-State":"AOJu0Yw1QhfbqrERS26Iecv2xF4BZornNC3EuccD9F92n+EVSORSME5r\n qrlds2JrFPpbWWmSzyrUFIahkKtXoAmDx2Z0uUxehmsCXpKziUDiblslJgzAaPQntzFqU7uC+UU\n PRhM=","X-Gm-Gg":"AeBDievqIUBWIbNH4TceUcxQQQrtG4nrD7+yCMwOchlB4y5po5MlomniA1XcsAYhAGR\n 937yLhxDv1aCeyprzn0Pl5My9VeSgI/+o0uXAesUxnytXieBVtN+hidlc1z5sSgfjf6lPAUYaPs\n E9zWFW7oKI2MIRDwXBwrcZABAnCkQZ/NliAcAAqT/Akv9a+YMLt1MLuJi5UVzqxGLdUft0iywSi\n mziHShBnb+qn400VnBkY+Y5Wpw7BIlrtYZYhU0Mli+nDd+wYEUQKjTSBQyyLFlNk21Ge+dUCtWD\n ulW18eEJnG2AWGBZvNFlO3JFMRPIU3BCQ55r6QNuSmBwbQ6Rc0n4Zvy256t01d9rQEmkCFdqNlj\n uiWeYbUrfOZzotmLHolDxbCbqOgGuufmj+ymmkwV83MhoLfxWTarBDG9pqC6F9AQ4hcBmxH3c++\n 1+qD2Zn3fKQvBpYeMRq1sS+eQVDKJf","X-Received":"by 2002:a05:6870:f203:b0:416:3d80:fb76 with SMTP id\n 586e51a60fabf-4230ffc22f7mr3636832fac.28.1775311443137;\n Sat, 04 Apr 2026 07:04:03 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass , Heinrich Schuchardt ,\n Ilias Apalodimas ,\n Tom Rini ","Subject":"[PATCH 06/14] test: Convert test_efi_bootmgr to use FsHelper","Date":"Sat, 4 Apr 2026 08:03:10 -0600","Message-ID":"<20260404140328.3724864-7-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260404140328.3724864-1-sjg@chromium.org>","References":"<20260404140328.3724864-1-sjg@chromium.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.39","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" ","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Simplify this test by using the helper.\n\nSigned-off-by: Simon Glass \n---\n\n test/py/tests/test_efi_bootmgr.py | 38 ++++++++++++-------------------\n 1 file changed, 14 insertions(+), 24 deletions(-)","diff":"diff --git a/test/py/tests/test_efi_bootmgr.py b/test/py/tests/test_efi_bootmgr.py\nindex 4c10cbdf17d..7d1f3f16d00 100644\n--- a/test/py/tests/test_efi_bootmgr.py\n+++ b/test/py/tests/test_efi_bootmgr.py\n@@ -5,7 +5,7 @@\n import shutil\n import pytest\n from subprocess import call, check_call, CalledProcessError\n-from tests import fs_helper\n+from tests.fs_helper import DiskHelper, FsHelper\n \n @pytest.mark.boardspec('sandbox')\n @pytest.mark.buildconfigspec('cmd_efidebug')\n@@ -20,22 +20,19 @@ def test_efi_bootmgr(ubman):\n Args:\n ubman -- U-Boot console\n \"\"\"\n- try:\n- efi_bootmgr_data, mnt = fs_helper.setup_image(ubman, 0, 0xc,\n- basename='test_efi_bootmgr')\n-\n- with open(mnt + '/initrd-1.img', 'w', encoding = 'ascii') as file:\n- file.write(\"initrd 1\")\n-\n- with open(mnt + '/initrd-2.img', 'w', encoding = 'ascii') as file:\n- file.write(\"initrd 2\")\n-\n- shutil.copyfile(ubman.config.build_dir + '/lib/efi_loader/initrddump.efi',\n- mnt + '/initrddump.efi')\n-\n- fsfile = fs_helper.mk_fs(ubman.config, 'vfat', 0x100000,\n- 'test_efi_bootmgr', mnt)\n- check_call(f'dd if={fsfile} of={efi_bootmgr_data} bs=1M seek=1', shell=True)\n+ with DiskHelper(ubman.config, 0, 'test_efi_bootmgr') as img, \\\n+ FsHelper(ubman.config, 'vfat', 1, 'test_efi_bootmgr') as fsh:\n+ with open(f'{fsh.srcdir}/initrd-1.img', 'w', encoding = 'ascii') as outf:\n+ outf.write(\"initrd 1\")\n+ with open(f'{fsh.srcdir}/initrd-2.img', 'w', encoding = 'ascii') as outf:\n+ outf.write(\"initrd 2\")\n+ shutil.copyfile(\n+ ubman.config.build_dir + '/lib/efi_loader/initrddump.efi',\n+ f'{fsh.srcdir}/initrddump.efi')\n+ fsh.mk_fs()\n+\n+ img.add_fs(fsh, DiskHelper.VFAT)\n+ efi_bootmgr_data = img.create()\n \n ubman.run_command(cmd = f'host bind 0 {efi_bootmgr_data}')\n \n@@ -61,10 +58,3 @@ def test_efi_bootmgr(ubman):\n \n ubman.run_command(cmd = 'efidebug boot rm 0001')\n ubman.run_command(cmd = 'efidebug boot rm 0002')\n- except CalledProcessError as err:\n- pytest.skip('Preparing test_efi_bootmgr image failed')\n- call('rm -f %s' % efi_bootmgr_data, shell=True)\n- return\n- finally:\n- call('rm -rf %s' % mnt, shell=True)\n- call('rm -f %s' % efi_bootmgr_data, shell=True)\n","prefixes":["06/14"]}