{"id":2219803,"url":"http://patchwork.ozlabs.org/api/patches/2219803/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-6-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-6-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-04T14:03:09","name":"[05/14] test: Convert test_xxd to use FsHelper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a095c6296ecc5a5df7b3acb5e92dc1f6c26b339e","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-6-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/2219803/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219803/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=UEcy2zfm;\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=\"UEcy2zfm\";\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 4fny5Q0k6jz1yG2\n\tfor ; Sun, 05 Apr 2026 01:04:42 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 0EBDF83642;\n\tSat, 4 Apr 2026 16:04:05 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id BD65883642; Sat, 4 Apr 2026 16:04:04 +0200 (CEST)","from mail-oa1-x2c.google.com (mail-oa1-x2c.google.com\n [IPv6:2001:4860:4864:20::2c])\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 9B1B580325\n for ; Sat, 4 Apr 2026 16:04:02 +0200 (CEST)","by mail-oa1-x2c.google.com with SMTP id\n 586e51a60fabf-42321c8b8f5so870311fac.1\n for ; Sat, 04 Apr 2026 07:04:02 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 586e51a60fabf-4232eb3d0e4sm2348235fac.6.2026.04.04.07.03.58\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 04 Apr 2026 07:03:58 -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=1775311440; x=1775916240; 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=/+V7AQXX4aGTSN0g//jrTjL8MH4caY3ts2MNEgIrAl0=;\n b=UEcy2zfmHiAHM5i0N6LwU36V4IEW3Twx2cChx18eSwq+Odnix8Eh0rDeU2rDr9fwcw\n CQoxHwBHMRW0xsscad7qLGEaoUwktgYmf1DToifl5GhPRlTyCNbkHD4VnZ2/0aFQIjkS\n gOGMOEWGDFpftsUlxkDBmUJB+rY+oefoAejfg=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775311440; x=1775916240;\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=/+V7AQXX4aGTSN0g//jrTjL8MH4caY3ts2MNEgIrAl0=;\n b=SI3L1wb/jCkunbi0s8CuhVXB69E7KAPdMKZqg5sJMdA94JN2bCuJLq6kV6FeLmb8ik\n hP8UJFil2OiDCLsMv9D4soNRoyA2s/EePc5pRYAT5nBShNJ1L8lVyrqtMzigdTgG+5eq\n aA6ZYj4+2FISQxZSINQDMpthx6rnkWn3ztQW7l2wGsl7rirzCo8LCmhrDOhJwUjDvJGY\n ZpHZhJsYNruU/cfP94Bneg+U5BUIYoVCfcfPHoygiFrZrgX/opEqkKPTxEU5ENmWN4Eu\n QEBVKvsS0SriZL5ON8AEcdRnDytt5t7WOSNYhO+DWNZsJ0tYZFuPv/j5QtQxrtvtd5Q4\n rCvQ==","X-Gm-Message-State":"AOJu0YyiTupgbJqTzBEpkwUnnDYbLJTS+gsODhsB7AVdt3Y/JkrkbcdQ\n 4sem6d1DeKjHDN0537J8JWkq69TnYpgYDhGtdh079U/vig6eKpBa4dMyM5u62d1QleIlNfNoB6h\n 3fKc=","X-Gm-Gg":"AeBDieu7hjSt1f9FnsymTc6kyG2aSedcUX35Q+IaaSVkFTSIuiyYKNfCdkSCW8TaLtI\n gQTVA9JJxJpxJsvtbGL7KwA8sx1ZGmU3zrvkVlC2EbVS7arPgaUebAq34SsYwReLhODOC98bFAM\n dzJoHMnOv18iVXCVYX9d9riH9FssDOjGoJE6Cz5miP2ORVxKWXN+OVfzjhxDHUf0gwfzdpgXmPi\n THYk0o6XYLss9r/N05tlhBO60jgrD3PTfwQ8+12hTapQX15J1XzxYWgdOeX93XvAa+4EsoB7Ihn\n PWRmLIZA7TnzinmFGEDoYEqj8kkrjJyWr/P8tuXhvJIija7Kyx8zAZrTr7oIPiSekr9NIZHONDw\n 94wFHrJXSQwE1d8qG/BkVdYFN+i0oYVNS+rE/LmZIQOkxc65ixPx+Smsy5jw7mtLTavthWDn3L8\n jhVzDspLVS2BI9a/cJ7w==","X-Received":"by 2002:a05:6870:9692:b0:417:43c8:a58e with SMTP id\n 586e51a60fabf-4230dd7444cmr3064186fac.3.1775311440590;\n Sat, 04 Apr 2026 07:04:00 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass ,\n\tTom Rini ","Subject":"[PATCH 05/14] test: Convert test_xxd to use FsHelper","Date":"Sat, 4 Apr 2026 08:03:09 -0600","Message-ID":"<20260404140328.3724864-6-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_xxd.py | 28 +++++++---------------------\n 1 file changed, 7 insertions(+), 21 deletions(-)","diff":"diff --git a/test/py/tests/test_xxd.py b/test/py/tests/test_xxd.py\nindex c457c54146c..a5f63f006fe 100644\n--- a/test/py/tests/test_xxd.py\n+++ b/test/py/tests/test_xxd.py\n@@ -4,8 +4,7 @@\n \"\"\"\n \n import pytest\n-from subprocess import call, check_call, CalledProcessError\n-from tests import fs_helper\n+from tests.fs_helper import FsHelper\n \n @pytest.mark.boardspec('sandbox')\n @pytest.mark.buildconfigspec('cmd_xxd')\n@@ -15,26 +14,13 @@ def test_xxd(ubman):\n Args:\n ubman -- U-Boot console\n \"\"\"\n- try:\n- scratch_dir = ubman.config.persistent_data_dir + '/scratch'\n-\n- check_call('mkdir -p %s' % scratch_dir, shell=True)\n-\n- with open(scratch_dir + '/hello', 'w', encoding = 'ascii') as file:\n- file.write('hello world\\n\\x00\\x01\\x02\\x03\\x04\\x05')\n-\n- xxd_data = fs_helper.mk_fs(ubman.config, 'vfat', 0x100000,\n- 'test_xxd', scratch_dir)\n- response = ubman.run_command_list([ f'host bind 0 {xxd_data}',\n- 'xxd host 0 hello'])\n+ with FsHelper(ubman.config, 'vfat', 1, 'test_xxd') as fsh:\n+ with open(f'{fsh.srcdir}/hello', 'w', encoding = 'ascii') as outf:\n+ outf.write('hello world\\n\\x00\\x01\\x02\\x03\\x04\\x05')\n+ fsh.mk_fs()\n+ response = ubman.run_command_list([f'host bind 0 {fsh.fs_img}',\n+ 'xxd host 0 hello'])\n \n assert '00000000: 68 65 6c 6c 6f 20 77 6f 72 6c 64 0a 00 01 02 03 hello world.....\\r\\r\\n' + \\\n '00000010: 04 05 ..' \\\n in response\n- except CalledProcessError as err:\n- pytest.skip('Preparing test_xxd image failed')\n- call('rm -f %s' % xxd_data, shell=True)\n- return\n- finally:\n- call('rm -rf %s' % scratch_dir, shell=True)\n- call('rm -f %s' % xxd_data, shell=True)\n","prefixes":["05/14"]}