{"id":2219801,"url":"http://patchwork.ozlabs.org/api/patches/2219801/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260404140328.3724864-5-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-5-sjg@chromium.org>","list_archive_url":null,"date":"2026-04-04T14:03:08","name":"[04/14] test: Convert test_cat to use FsHelper","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"abdb5aef45758ab6fd59d1ab68e9326849ab3e35","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-5-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/2219801/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2219801/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=iVXhkGl+;\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=\"iVXhkGl+\";\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 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fny5D6RNhz1yG2\n\tfor ; Sun, 05 Apr 2026 01:04:32 +1100 (AEDT)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id C4BEE84129;\n\tSat, 4 Apr 2026 16:04:03 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 419EA80325; Sat, 4 Apr 2026 16:04:02 +0200 (CEST)","from mail-oa1-x32.google.com (mail-oa1-x32.google.com\n [IPv6:2001:4860:4864:20::32])\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 A264183642\n for ; Sat, 4 Apr 2026 16:03:59 +0200 (CEST)","by mail-oa1-x32.google.com with SMTP id\n 586e51a60fabf-40423dbe98bso1007436fac.2\n for ; Sat, 04 Apr 2026 07:03:59 -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.55\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 04 Apr 2026 07:03:56 -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=1775311438; x=1775916238; 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=gy6xutbHcwVWD/p+tmP+at/3H8NsY6yA7pZYmxjKOg0=;\n b=iVXhkGl+3UD66fhlkiRKCwhWpDjiariYlmMYXD0DLHH8K4J9baAqM6JGY7MkmhHF4+\n T7Ruf31qxX4TLQ0HCnVJKn8PkvlEabhqYnyyttROU+jNX9M+zX90S30fp9T8tImlZOyq\n qnps00BbTn53pjkfaqhiZvoZ2j9zgMFfN2s18=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775311438; x=1775916238;\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=gy6xutbHcwVWD/p+tmP+at/3H8NsY6yA7pZYmxjKOg0=;\n b=hgnfFmjqaXXjoHQUL0J7gWZHpJuUEAyUJMrIteKN5op8/mZ5i0TWWTi9ZkMAg2kw5y\n v5SPu3c07k4XDEiVzyJDfp5nwsXX7nNLINqy8TwcPqt8AHL/CHo6DC5973PleH1O6qz7\n jnzWIQsHAJDAOoetJQOlf5r8K0TDlktfd/Twy96NhWyYA4xD0Fg4Lsr0NJKDjQPrJPS8\n UUrdEvGXjLMumF6nxa9/Rz6tL5TW/BIcPJq8e4TBrG4saFxJz/c4P3gtuR9T/y4ukyNk\n /sklb6Yq7KZ37Ohm25iKnQN3G5gemSQnFOtmkyuDghK+kMWFcbwwWJxC9G3Fp4hLK8pS\n x5tQ==","X-Gm-Message-State":"AOJu0Yxp9zO2Dj6yTlhvYhPKdKkxmsm/XpMHzEWxPlvkwR2KZYzQ1lTq\n 8U2AtkdI3xUlpYW7LpoI72kqXKIwqvBvm7coor7Hj/QMedn9LEU9TTfqrauCJwpRMEwQZeoGNpd\n eSlk=","X-Gm-Gg":"AeBDieuSKNTslGCNSWKt+A7LK9/5thTzv2Nzubja4TKOYzOH3AXzqOYc4q5VoOYUNeS\n 8WejzSE+bS64gAaHKTGSVMhYJ7FkkT3JUYUmQLOCabP5cdkAT3Q0L8AlENn7cwmoYTb6y5+tKmb\n d79hOTT3UE8ao3mgYpOw1C7RS3T4gUdiyI/ADeTkeHjxVe9u88HbIgDWQ+Im8/G5qmcfys3xcaO\n 83glGrrTNNSk/BT7j4QqwXQnGttGc8ZGTXJaekbvQZNVx812Ib+kqBpMc9N/SV5qf2G0xGfMYzH\n sZoZAXqFcmeR1eGT3RKmVI2CS6HxU9wysKLqRh0scmDR3jed31gT4UieKRREwqGqR/DBj4vDXdO\n 8s3P3SWeEKxKkaCz3wMIQgdWjXyN2uwRf/S3/KQDtr+KfGOfsgvTdUBtPJ0JCDX/+tw9xX2UX0F\n YOwMDQNvq/MMASD4UNGw==","X-Received":"by 2002:a05:6870:521:b0:3eb:7a2e:34a4 with SMTP id\n 586e51a60fabf-4230ff388a5mr3765639fac.28.1775311437690;\n Sat, 04 Apr 2026 07:03:57 -0700 (PDT)","From":"Simon Glass ","To":"u-boot@lists.denx.de","Cc":"Simon Glass ,\n\tTom Rini ","Subject":"[PATCH 04/14] test: Convert test_cat to use FsHelper","Date":"Sat, 4 Apr 2026 08:03:08 -0600","Message-ID":"<20260404140328.3724864-5-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_cat.py | 27 +++++++--------------------\n 1 file changed, 7 insertions(+), 20 deletions(-)","diff":"diff --git a/test/py/tests/test_cat.py b/test/py/tests/test_cat.py\nindex 252c3d50a02..f793b9fe0a1 100644\n--- a/test/py/tests/test_cat.py\n+++ b/test/py/tests/test_cat.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_cat')\n@@ -15,23 +14,11 @@ def test_cat(ubman):\n Args:\n ubman -- U-Boot console\n \"\"\"\n- try:\n- scratch_dir = ubman.config.persistent_data_dir + '/scratch'\n+ with FsHelper(ubman.config, 'vfat', 1, 'test_cat') as fsh:\n+ with open(f'{fsh.srcdir}/hello', 'w', encoding = 'ascii') as outf:\n+ outf.write('hello world\\n')\n+ fsh.mk_fs()\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')\n-\n- cat_data = fs_helper.mk_fs(ubman.config, 'vfat', 0x100000,\n- 'test_cat', scratch_dir)\n- response = ubman.run_command_list([ f'host bind 0 {cat_data}',\n- 'cat host 0 hello'])\n+ response = ubman.run_command_list([f'host bind 0 {fsh.fs_img}',\n+ 'cat host 0 hello'])\n assert 'hello world' in response\n- except CalledProcessError as err:\n- pytest.skip('Preparing test_cat image failed')\n- call('rm -f %s' % cat_data, shell=True)\n- return\n- finally:\n- call('rm -rf %s' % scratch_dir, shell=True)\n- call('rm -f %s' % cat_data, shell=True)\n","prefixes":["04/14"]}