{"id":2219811,"url":"http://patchwork.ozlabs.org/api/patches/2219811/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-14-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-14-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-04T14:03:17","name":"[13/14] test: Convert setup_rauc_image() to use FsHelper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f6838866b241a40d91a470c89c1eef662b378be6","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-14-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/2219811/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219811/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=TopcSAEa;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de\n (client-ip=85.214.62.61; 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=\"TopcSAEa\";\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 [85.214.62.61])\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 4fny6s5KTHz1yCs\n\tfor ; Sun, 05 Apr 2026 01:05:57 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 42A91841B9;\n\tSat, 4 Apr 2026 16:04:28 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 97F5583B48; Sat, 4 Apr 2026 16:04:26 +0200 (CEST)","from mail-oa1-x41.google.com (mail-oa1-x41.google.com\n [IPv6:2001:4860:4864:20::41])\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 5EA8F8419C\n for ; Sat, 4 Apr 2026 16:04:24 +0200 (CEST)","by mail-oa1-x41.google.com with SMTP id\n 586e51a60fabf-4042fe53946so1060995fac.3\n for ; Sat, 04 Apr 2026 07:04:24 -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.20\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 04 Apr 2026 07:04:20 -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=1775311462; x=1775916262; 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=CVocBM7IQcbPlxxWNehuDzdP9lwa2qDFmTrtBFCUSuU=;\n b=TopcSAEaV83mhnZfYAJYvuaaKfeSBHOSAP3/CkwLi4l9VkIekW/SNGrnRLKz8vsSeq\n ENRG2Q3IjVtko06o4LhDg9IZWkFOUvuTYPeYobmhR40BDK+QMeiFAAZj6Fl78i5vf3Mx\n bgFnUVkjeOfpd5astcJ+mH9cDDLFU8PcpTzOI=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775311462; x=1775916262;\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=CVocBM7IQcbPlxxWNehuDzdP9lwa2qDFmTrtBFCUSuU=;\n b=TYFptvzgTefjzHSe7B4YA/rm6f533IL3VE1f2cnVKnS7NKJ1l+C6Q/4np7iZaqG6fo\n fZSe7h4q4OgbAakZlqUvrXEByE6Xa4UkD8VBBt+LFPNBvUzVjfh3Bcwmhvs4FjOTFBuo\n jPppSbYyXkyFPNW2pWTSHLtgAI5iD9aczaeUA1mt2m2Zv7vngAhZshlqIv/H9P55al+o\n g+1z1Nfmdj/QvX8Q8smhVjAwudQJ4q/HNNKL2FyQpkfTOqSqJnouRWkz6Xq1mTsVx+TK\n FTPMRZpqQn1BnR4jghrPV03Tj7/18e48LnB/f1D2wvGB9JxMgOX0ZzGAAxMVw/mswRn2\n x1qQ==","X-Gm-Message-State":"AOJu0Yz+Wrkg+XOm5SQvOOHgVaNkQscwH8kHFlzuCTxeEpZXRzNC06Ru\n jaoyO7WaDYC9rRlKczEmInXyFmc2Ntl85B9cC1ZPctRxX+e2SCKK/f3Vu3so4+BlKq6EHedAIsx\n +lp7xXKGM","X-Gm-Gg":"AeBDietFRU0M6Odkc7ziLmF2vy7g6QVAY6ttpdrPGTiNnhMFkGMbr7gp9Z8gNpnoJBB\n vE9QgLdgj6PJwn4908COcJJfdIp4bTi+aA5RikEtFtXa+QNpB2pRFYLfb+x2Fy8QB4um0dOmYlh\n DUgbqD0euNeGg9DwrQC6dVZTx/eS0AWtKr5LKx188spywhPMIFcZRuyzcsbLqq9QwL908+ZxeJQ\n wewfFKSQ7kGtflrL/O+rmqiD88K0FvZ0TNEc9biIeinM2IzZLJ/dVnzHNCGLfA7MsS+ivAJv3sn\n PyrdK4MrQa5OP5hwAolxVpc8yTraqGID121eW2Q6lJO33jBEMeq8r0xq1fZpez92I/Zn0LL0vDK\n A0WYh3dPJXlND3CCDxI2PWrhVen0NI1wSOW7EKYCsUgV7Dp3rGCAUA4fMI8F0lyGVfMa9RehFLP\n pXbVXQF9wROruvo21OFGJMQ0tL5xL1","X-Received":"by 2002:a05:6870:e087:b0:41b:e72e:c115 with SMTP id\n 586e51a60fabf-4230fbf02e2mr3362949fac.1.1775311462472;\n Sat, 04 Apr 2026 07:04:22 -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 13/14] test: Convert setup_rauc_image() to use FsHelper","Date":"Sat, 4 Apr 2026 08:03:17 -0600","Message-ID":"<20260404140328.3724864-14-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":"Use FsHelper and DiskHelper to create the RAUC A/B disk image. This\nreplaces the manual sfdisk and dd commands, making the code shorter\nand easier to follow.\n\nThe same boot and root filesystems are added twice to produce the\nA/B partition layout.\n\nSigned-off-by: Simon Glass \n---\n\n test/py/tests/test_ut.py | 50 +++++++++++++++-------------------------\n 1 file changed, 18 insertions(+), 32 deletions(-)","diff":"diff --git a/test/py/tests/test_ut.py b/test/py/tests/test_ut.py\nindex a858f2c2d13..dce5a37dd35 100644\n--- a/test/py/tests/test_ut.py\n+++ b/test/py/tests/test_ut.py\n@@ -585,48 +585,34 @@ def setup_efi_image(ubman):\n def setup_rauc_image(ubman):\n \"\"\"Create a 40MB disk image with an A/B RAUC system on it\"\"\"\n mmc_dev = 10\n- fname = os.path.join(ubman.config.source_dir, f'mmc{mmc_dev}.img')\n- mnt = ubman.config.persistent_data_dir\n-\n- spec = 'type=c, size=8M, start=1M, bootable\\n' \\\n- 'type=83, size=10M\\n' \\\n- 'type=c, size=8M, bootable\\n' \\\n- 'type=83, size=10M'\n \n- utils.run_and_log(ubman, f'qemu-img create {fname} 40M')\n- utils.run_and_log(ubman, ['sh', '-c', f'printf \"{spec}\" | sfdisk {fname}'])\n+ boot = FsHelper(ubman.config, 'fat32', 8, 'rauc_boot')\n+ boot.setup()\n \n # Generate boot script\n script = '# dummy boot script'\n- bootdir = os.path.join(mnt, 'boot')\n- utils.run_and_log(ubman, f'mkdir -p {bootdir}')\n- cmd_fname = os.path.join(bootdir, 'boot.cmd')\n- scr_fname = os.path.join(bootdir, 'boot.scr')\n+ cmd_fname = os.path.join(boot.srcdir, 'boot.cmd')\n+ scr_fname = os.path.join(boot.srcdir, 'boot.scr')\n with open(cmd_fname, 'w', encoding='ascii') as outf:\n print(script, file=outf)\n \n mkimage = os.path.join(ubman.config.build_dir, 'tools/mkimage')\n utils.run_and_log(\n ubman, f'{mkimage} -C none -A arm -T script -d {cmd_fname} {scr_fname}')\n- utils.run_and_log(ubman, f'rm -f {cmd_fname}')\n-\n- # Generate empty rootfs\n- rootdir = os.path.join(mnt, 'root')\n- utils.run_and_log(ubman, f'mkdir -p {rootdir}')\n-\n- # Create boot filesystem image with boot script in it and copy to disk image\n- fsfile = f'rauc_boot.fat32.img'\n- fs_helper.mk_fs(ubman.config, 'fat32', 0x800000, fsfile.split('.')[0], bootdir)\n- utils.run_and_log(ubman, f'dd if={mnt}/{fsfile} of=mmc{mmc_dev}.img bs=1M seek=1 conv=notrunc')\n- utils.run_and_log(ubman, f'dd if={mnt}/{fsfile} of=mmc{mmc_dev}.img bs=1M seek=19 conv=notrunc')\n- utils.run_and_log(ubman, f'rm -f {scr_fname}')\n-\n- # Create empty root filesystem image and copy to disk image\n- fsfile = f'rauc_root.ext4.img'\n- fs_helper.mk_fs(ubman.config, 'ext4', 0xa00000, fsfile.split('.')[0], rootdir)\n- utils.run_and_log(ubman, f'dd if={mnt}/{fsfile} of=mmc{mmc_dev}.img bs=1M seek=9 conv=notrunc')\n- utils.run_and_log(ubman, f'dd if={mnt}/{fsfile} of=mmc{mmc_dev}.img bs=1M seek=27 conv=notrunc')\n- utils.run_and_log(ubman, f'rm -f {fsfile}')\n+ os.remove(cmd_fname)\n+ boot.mk_fs()\n+\n+ root = FsHelper(ubman.config, 'ext4', 10, 'rauc_root')\n+ root.mk_fs()\n+\n+ img = DiskHelper(ubman.config, mmc_dev, 'mmc', True)\n+ img.add_fs(boot, DiskHelper.VFAT, bootable=True)\n+ img.add_fs(root, DiskHelper.EXT4)\n+ img.add_fs(boot, DiskHelper.VFAT, bootable=True)\n+ img.add_fs(root, DiskHelper.EXT4)\n+ img.create()\n+ boot.cleanup()\n+ root.cleanup()\n \n @pytest.mark.buildconfigspec('cmd_bootflow')\n @pytest.mark.buildconfigspec('sandbox')\n","prefixes":["13/14"]}