{"id":2222691,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2222691/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20260413130007.1987326-6-sjg@chromium.org/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/1.1/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},"msgid":"<20260413130007.1987326-6-sjg@chromium.org>","date":"2026-04-13T12:59:56","name":"[v3,5/8] test: Update fit test to fix a few Python warnings","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"db7895322dbdcef9a04c0af8334f15f539d138e8","submitter":{"id":6170,"url":"http://patchwork.ozlabs.org/api/1.1/people/6170/?format=json","name":"Simon Glass","email":"sjg@chromium.org"},"delegate":{"id":3651,"url":"http://patchwork.ozlabs.org/api/1.1/users/3651/?format=json","username":"trini","first_name":"Tom","last_name":"Rini","email":"trini@ti.com"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20260413130007.1987326-6-sjg@chromium.org/mbox/","series":[{"id":499699,"url":"http://patchwork.ozlabs.org/api/1.1/series/499699/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=499699","date":"2026-04-13T12:59:52","name":"test: Refactor FIT test for clarity and extensibility","version":3,"mbox":"http://patchwork.ozlabs.org/series/499699/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2222691/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2222691/checks/","tags":{},"headers":{"Return-Path":"<u-boot-bounces@lists.denx.de>","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=RGA/PMem;\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=\"RGA/PMem\";\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 4fvSHG2D7Gz1xtJ\n\tfor <incoming@patchwork.ozlabs.org>; Mon, 13 Apr 2026 23:02:18 +1000 (AEST)","from h2850616.stratoserver.net (localhost [IPv6:::1])\n\tby phobos.denx.de (Postfix) with ESMTP id 7AF718422D;\n\tMon, 13 Apr 2026 15:01:48 +0200 (CEST)","by phobos.denx.de (Postfix, from userid 109)\n id 05C8984198; Mon, 13 Apr 2026 15:01:44 +0200 (CEST)","from mail-ot1-x332.google.com (mail-ot1-x332.google.com\n [IPv6:2607:f8b0:4864:20::332])\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 A8DCE84227\n for <u-boot@lists.denx.de>; Mon, 13 Apr 2026 15:01:40 +0200 (CEST)","by mail-ot1-x332.google.com with SMTP id\n 46e09a7af769-7dbd23bc684so2507562a34.2\n for <u-boot@lists.denx.de>; Mon, 13 Apr 2026 06:01:40 -0700 (PDT)","from chromium.org ([73.34.74.121]) by smtp.gmail.com with ESMTPSA id\n 46e09a7af769-7dc2696532bsm8369144a34.21.2026.04.13.06.01.33\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Mon, 13 Apr 2026 06:01:33 -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=1776085298; x=1776690098; 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=+9Tn0VH4oSx3AdU4sU7QfHuzg3FL0kz9+OT6yTwOMuk=;\n b=RGA/PMemTcFIWGbvkO2iJ6QFNZWDc2OftPzhb9uW0msDzxZHEUTiR4jL9wxhueliZ5\n CwcaOI3Gk80dPcdGo0tjPIYgkXXU0XaVtZFoDEnOgN5t3wLTy3tZeY8GUy1A8lG+Kypi\n jrUKOQbDYudQ2m2pIT1GVrr2oYx9RoPMaVIsw=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1776085298; x=1776690098;\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=+9Tn0VH4oSx3AdU4sU7QfHuzg3FL0kz9+OT6yTwOMuk=;\n b=fBYCv6wAY7KzIDKoJcIzD2McllFnJPVuRYTOQ31tctcu45N0BVA3jb/fx2EozNRcRS\n MIYzs4fxAwm/NcR4h4o4emzOt0SKhYzB4zDLq8KYD6IW7g7hvmJoxYvysusX6YgIJg5d\n FcjtJ0B+TsouvucLN2iUeUvM6U5HRoVY7DKkSovoOg4fpp+o8UWcUV4Y7kqy5IKAfelN\n 9vpJuK0F7J9rxqT0dky1PsRjHT/IFwOnDKMQvR2UE33ZCBPHpEmiD0cuStF5ptCqzRyJ\n 8QpXanVqQ8scr1vPdoL8ep0vm68BucHKhyBOyF1hcNESZ2HLOkSJQ64jFL2VorE/CMUL\n 2t5g==","X-Gm-Message-State":"AOJu0Yzv+LCKItfa+FwttRP5v274URC9jTRARnjmXO/RIauzLpaIefT6\n EkhfOkbKXlYBGdcIfcssMqlnIwWByFHblD1QQJKaA4FnySI5e2L5W7uT7Ir9ORURx/UTykmqiZ7\n UbvD3fw==","X-Gm-Gg":"AeBDietwWKVm8pNBr6115yh8hF22DZX3Y2EJNCLD5jv48AHu1CqdjTBOcOelbPF/5aw\n KfhCl0HuXwwv0+ohuDymFmH31cavTyUyu0/M9wo4yBwcu3XnZo9CRmv6ocFzJsY0L1/pZnQ21bk\n ccGiZeKs05NvNkD2J+rlaraRda158nUrFaJHlSEmpmO3FE8S5WnkUarwJOmFVqvzevtNB5nmsBb\n NRfZO/zRqoQqB8xlNcfsZpDFVQKpurG1CsLzqUGa/DttsSoO+sjvLOfr6JX2EWSA+nOfHUB7dXC\n R0Uk3eDft/gwFat/7+itbPrzywxGy+tgY1Y639ZfUvY5nZtfKW7QehGt81yfL0iUKRh1TxAvTdp\n 22j5IeVt4jxMZS5sE22LR3vK80O0Hd94MphQo4H/C5HcwGrX0waZjqDum+1oEUAyeXqp9gAqODu\n c2tCc0WF9QSaN1OynWRw==","X-Received":"by 2002:a05:6830:25c3:b0:7d9:d483:e0be with SMTP id\n 46e09a7af769-7dc27f2d63fmr7398028a34.25.1776085295369;\n Mon, 13 Apr 2026 06:01:35 -0700 (PDT)","From":"Simon Glass <sjg@chromium.org>","To":"u-boot@lists.denx.de","Cc":"Simon Glass <sjg@chromium.org>,\n\tTom Rini <trini@konsulko.com>","Subject":"[PATCH v3 5/8] test: Update fit test to fix a few Python warnings","Date":"Mon, 13 Apr 2026 06:59:56 -0600","Message-ID":"<20260413130007.1987326-6-sjg@chromium.org>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260413130007.1987326-1-sjg@chromium.org>","References":"<20260413130007.1987326-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 <u-boot.lists.denx.de>","List-Unsubscribe":"<https://lists.denx.de/options/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=unsubscribe>","List-Archive":"<https://lists.denx.de/pipermail/u-boot/>","List-Post":"<mailto:u-boot@lists.denx.de>","List-Help":"<mailto:u-boot-request@lists.denx.de?subject=help>","List-Subscribe":"<https://lists.denx.de/listinfo/u-boot>,\n <mailto:u-boot-request@lists.denx.de?subject=subscribe>","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" <u-boot-bounces@lists.denx.de>","X-Virus-Scanned":"clamav-milter 0.103.8 at phobos.denx.de","X-Virus-Status":"Clean"},"content":"Fix some warnings and disable one that cannot be fixed.\n\nSigned-off-by: Simon Glass <sjg@chromium.org>\n---\n\n(no changes since v1)\n\n test/py/tests/test_fit.py | 15 +++++++++------\n 1 file changed, 9 insertions(+), 6 deletions(-)","diff":"diff --git a/test/py/tests/test_fit.py b/test/py/tests/test_fit.py\nindex 9bfe25c0a51..6a8649792cf 100755\n--- a/test/py/tests/test_fit.py\n+++ b/test/py/tests/test_fit.py\n@@ -1,13 +1,14 @@\n # SPDX-License-Identifier:\tGPL-2.0+\n # Copyright (c) 2013, Google Inc.\n-#\n-# Sanity check of the FIT handling in U-Boot\n+\n+\"\"\"Sanity check of the FIT handling in U-Boot\"\"\"\n \n import os\n-import pytest\n import struct\n-import utils\n+\n+import pytest\n import fit_util\n+import utils\n \n # Define a base ITS which we can adjust using % and a dictionary\n base_its = '''\n@@ -160,8 +161,8 @@ def test_fit_base(ubman):\n         fname = make_fname(filename)\n         data = ''\n         for i in range(100):\n-            data += '%s %d was seldom used in the middle ages\\n' % (text, i)\n-        with open(fname, 'w') as fd:\n+            data += f'{text} {i} was seldom used in the middle ages\\n'\n+        with open(fname, 'w', encoding='ascii') as fd:\n             print(data, file=fd)\n         return fname\n \n@@ -202,6 +203,7 @@ def test_fit_base(ubman):\n                           'third_line:')\n         '30'\n         \"\"\"\n+        # pylint: disable=W0612\n         __tracebackhide__ = True\n         for line in '\\n'.join(text).splitlines():\n             pos = line.find(match)\n@@ -209,6 +211,7 @@ def test_fit_base(ubman):\n                 return line[:pos] + line[pos + len(match):]\n \n         pytest.fail(\"Expected '%s' but not found in output\")\n+        return '<no-match>'\n \n     def check_equal(expected_fname, actual_fname, failure_msg):\n         \"\"\"Check that a file matches its expected contents\n","prefixes":["v3","5/8"]}