{"id":2219805,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2219805/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-8-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.2/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-8-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-04T14:03:11","name":"[07/14] test: Convert setup_bootmenu_image() to use FsHelper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"8d18b39706a6d17b083fb25d63bef32b6f935dc2","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/1.2/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-8-sjg@chromium.org/mbox/","series":[{"id":498729,"url":"http://patchwork.ozlabs.org/api/1.2/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/2219805/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219805/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=ONaLc1Ee;\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=\"ONaLc1Ee\";\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 4fny5m1Qvhz1yG2\n\tfor ; Sun, 05 Apr 2026 01:05:00 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 8089484154;\n\tSat, 4 Apr 2026 16:04:10 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 41B4584020; Sat, 4 Apr 2026 16:04:09 +0200 (CEST)","from mail-ot1-x32e.google.com (mail-ot1-x32e.google.com\n [IPv6:2607:f8b0:4864:20::32e])\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 189F184101\n for ; Sat, 4 Apr 2026 16:04:07 +0200 (CEST)","by mail-ot1-x32e.google.com with SMTP id\n 46e09a7af769-7dbba5076c8so675308a34.0\n for ; Sat, 04 Apr 2026 07:04:07 -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.03\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 04 Apr 2026 07:04:04 -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=1775311445; x=1775916245; 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=sItkOvvhVkwURHZFcKDrDWPJB/dJVW+Pw1ZmN22mN2c=;\n b=ONaLc1Eeb6KC6/xiLAfPT/V+1yUgtIC5x24puwq8SSN+ASwlFcUl+sXv61Z6rbkiCW\n V+wkIqIL1CblwYXPoAfTj8z9wSocHgm++Bs5xWvNS8ReoA0zOk8d10IJ9MfmCOydUxwe\n hxWaKv7+PCeFLYir6V6vi1b6EKxiMpzf3JUR8=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775311445; x=1775916245;\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=sItkOvvhVkwURHZFcKDrDWPJB/dJVW+Pw1ZmN22mN2c=;\n b=SrwsOFcem+7NlmrLbUw5MTYpLqS3YSsnbEiGts/9AvqYrEImp7JkF0qQKQ6JAgDd3E\n Htazoebkcw2E4bP0wjNluh0O4n3TCPEApf7ct2Z9BvY+1jlhs4LHcs/+Gzec/jn8ykzm\n nAgV2+NbuJXQIk+stbeImxFfLTZxzCTpN8e2Ml0kTKfLMV7hqVhAv2UN2jAj+JwUx0F6\n QgWqhTDp71sqTvnmBXUImyGxDc6/is9uVA/CB1XKKWJohSOARLhPC8NX4wtg2HxAMx60\n sqqniWo0hV/IwcHUMA7lryjkp5m6LbNytSW15Fhafz9KplRS6dSdUIo/4HBP/URwPMi3\n PUtA==","X-Gm-Message-State":"AOJu0Yzj3UBtSkzFIhN3AioEB5yybuhJVbMfM/q6zn+d0C43Ee3ts3Hx\n Tk3h3Ggr+BNjr7SqgjfvEiiF+G+C3B9UZt34oC1z88UwBTENf9kDwYGgfQLgM1JyT65o0cBYaCB\n A2QU=","X-Gm-Gg":"AeBDievflrpgN7SxXd8SENqj+cjjqJod9ubcw9nD1HrsSttEFTvbmWXty/T0f4csaCj\n jVy8O0t1GkqWhUgL0W8sxTBhieLnXQtVF5pLql2XblqKgZj4RCJimncnIQCfoEJcJ0JTd3U/0kA\n w/4Pqeb/JeMguQfdJJ4tVKC6i4sjzqpK3kFv3jEU1c40LcFdrs0Up0S8bMEqoLkt4/QJsZOaZgZ\n +SNFVvSewOoDQj1bFbuOoVmjpWP9jAVeXBLN6kPFfEJSVL6fOf2NwJ0YQykK1pMnkMJdyLk2SBZ\n 302qVga085/LhNmzntUK4ykTdyi96jh7cEX19tj7/GcLb97h+cB5jay1TqnH62M7BSXWWnmJ5iS\n xXmN++0NaWaPfTZ7AtD2L93Ljme05IOilTBttnX7XyyUhxjEkotpM4K8YWy6/lFGepff9jWt7VY\n lqXyHT8vP7l7JTwxI/7g==","X-Received":"by 2002:a05:6870:529:b0:423:1858:63e1 with SMTP id\n 586e51a60fabf-423185883famr2979528fac.31.1775311444961;\n Sat, 04 Apr 2026 07:04:04 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass , Heinrich Schuchardt ,\n Marek Vasut ,\n Martin Schwan ,\n Mattijs Korpershoek ,\n Tom Rini ","Subject":"[PATCH 07/14] test: Convert setup_bootmenu_image() to use FsHelper","Date":"Sat, 4 Apr 2026 08:03:11 -0600","Message-ID":"<20260404140328.3724864-8-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-setup code by using the helper.\n\nSigned-off-by: Simon Glass \n---\n\n test/py/tests/test_ut.py | 17 +++++++++--------\n 1 file changed, 9 insertions(+), 8 deletions(-)","diff":"diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py\nindex 98641a46c1d..a1c4af1b096 100644\n--- a/test/py/tests/test_ut.py\n+++ b/test/py/tests/test_ut.py\n@@ -17,6 +17,7 @@ import pytest\n import utils\n # pylint: disable=E0611\n from tests import fs_helper\n+from fs_helper import DiskHelper, FsHelper\n from test_android import test_abootimg\n \n def mkdir_cond(dirname):\n@@ -45,7 +46,6 @@ def setup_bootmenu_image(ubman):\n This is modelled on Armbian 22.08 Jammy\n \"\"\"\n mmc_dev = 4\n- fname, mnt = fs_helper.setup_image(ubman, mmc_dev, 0x83)\n \n script = '''# DO NOT EDIT THIS FILE\n #\n@@ -121,7 +121,9 @@ booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\n # Recompile with:\n # mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr\n '''\n- bootdir = os.path.join(mnt, 'boot')\n+ fsh = FsHelper(ubman.config, 'ext4', 18, 'mmc')\n+ fsh.setup()\n+ bootdir = os.path.join(fsh.srcdir, 'boot')\n mkdir_cond(bootdir)\n cmd_fname = os.path.join(bootdir, 'boot.cmd')\n scr_fname = os.path.join(bootdir, 'boot.scr')\n@@ -150,13 +152,12 @@ booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}\n utils.run_and_log(\n ubman, f'echo here {kernel} {symlink}')\n os.symlink(kernel, symlink)\n+ fsh.mk_fs()\n+ img = DiskHelper(ubman.config, mmc_dev, 'mmc', True)\n+ img.add_fs(fsh, DiskHelper.EXT4)\n+ img.create()\n+ fsh.cleanup()\n \n- fsfile = 'ext18M.img'\n- utils.run_and_log(ubman, f'fallocate -l 18M {fsfile}')\n- utils.run_and_log(ubman, f'mkfs.ext4 {fsfile} -d {mnt}')\n- copy_partition(ubman, fsfile, fname)\n- utils.run_and_log(ubman, f'rm -rf {mnt}')\n- utils.run_and_log(ubman, f'rm -f {fsfile}')\n \n def setup_bootflow_image(ubman):\n \"\"\"Create a 20MB disk image with a single FAT partition\"\"\"\n","prefixes":["07/14"]}