From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B0783C04A95 for ; Sun, 25 Sep 2022 15:09:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 79A5E84D9B; Sun, 25 Sep 2022 17:04:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="nioCxLTZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7E4ED84C60; Sun, 25 Sep 2022 17:03:57 +0200 (CEST) Received: from mail-io1-xd33.google.com (mail-io1-xd33.google.com [IPv6:2607:f8b0:4864:20::d33]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B28B384C4F for ; Sun, 25 Sep 2022 17:03:53 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-io1-xd33.google.com with SMTP id v128so3406083ioe.12 for ; Sun, 25 Sep 2022 08:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=FiYqCQH6p4VCyIn/ZH7GbLJfbMGj0ph3ErBGt9qo/sk=; b=nioCxLTZ/SH/1Ej6571H3wPO62cybEbxaHat2zv/1+6bWWt8pJiYbpUzmvnj/hnrNP GIjuPtl5OMzXjh3yRwpdAeIdlj1IIi0jv6GGmeWmOj93bKhwK/+gjtGEAXpw5nO9pg03 +gYBvRqlACxzypdVjUN7XMjP2vA2ysbpO0cmE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=FiYqCQH6p4VCyIn/ZH7GbLJfbMGj0ph3ErBGt9qo/sk=; b=DM9QCUYbjpeetbhd1qEblPE3CkbJMjNQHxpv4UfQkooRADHjIjtBw9YfBrOCtMrD9m GZn95WW3Hti0Pss/NmhpWsJe4y7hcRSroOax7NO8gF0Q/61p6P4w7mxzXGYc+mmdGNkz LENBg11TwwBE0uwD90HU2ogK2CUKrB50kD5aYrza9QLR0PsXz9lrGi49ozWipkJLi8Au VvpcMiK/B2qQyPEiAEo1PU78q8X2Ko/eC744kbiM974B5kXyh2sJrxyGOqwTEVNZPz/H krbDBwJ4xItkErjlM00kBpiB8YqZYGtOm5jEBaR2VJVqQpGoDGbUXReJAF5HntPxDVXV 5zgQ== X-Gm-Message-State: ACrzQf3cqG4Uc+lR2kl/UfOhbP3JNTQqzZwX+Lxxq/zpcOw1dDTvK8le kj3Og2nGlIe8HaeNGxdCPPWGGmzOi68gZg== X-Google-Smtp-Source: AMsMyM775A/DmD5ba2sG53bemxsIJE3W89JsI5JZ6WXMlnhARe4dlGbLU5GSwpIi8gfasCLGD4/UqA== X-Received: by 2002:a05:6638:238a:b0:35a:25b7:a1a7 with SMTP id q10-20020a056638238a00b0035a25b7a1a7mr9926919jat.92.1664118232981; Sun, 25 Sep 2022 08:03:52 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id u19-20020a926013000000b002f19d9838c6sm5360578ilb.25.2022.09.25.08.03.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Sep 2022 08:03:52 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH 40/45] vbe: Correct pylint warnings in test_vbe Date: Sun, 25 Sep 2022 09:02:43 -0600 Message-Id: <20220925150248.2524421-41-sjg@chromium.org> X-Mailer: git-send-email 2.37.3.998.g577e59143f-goog In-Reply-To: <20220925150248.2524421-1-sjg@chromium.org> References: <20220925150248.2524421-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: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Fix these before adding to the test. Signed-off-by: Simon Glass --- test/py/tests/test_vbe.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/test/py/tests/test_vbe.py b/test/py/tests/test_vbe.py index 559c2918868..a39cf0b31c6 100644 --- a/test/py/tests/test_vbe.py +++ b/test/py/tests/test_vbe.py @@ -1,14 +1,17 @@ # SPDX-License-Identifier: GPL-2.0+ # Copyright 2022 Google LLC -# -# Test addition of VBE + +"""Test VBE OS requests are processed correctly + +These should result in additions (fixups) to the device tree. +""" import pytest import fit_util # Define a base ITS which we can adjust using % and a dictionary -base_its = ''' +BASE_ITS = ''' /dts-v1/; / { @@ -64,7 +67,7 @@ base_its = ''' ''' # Define a base FDT - currently we don't use anything in this -base_fdt = ''' +BASE_FDT = ''' /dts-v1/; / { @@ -77,7 +80,7 @@ base_fdt = ''' # then run the 'bootm' command, then run the unit test which checks that the # working tree has the required things filled in according to the OS requests # above (random, aslr2, etc.) -base_script = ''' +BASE_SCRIPT = ''' host load hostfs 0 %(fit_addr)x %(fit)s fdt addr %(fit_addr)x bootm start %(fit_addr)x @@ -91,9 +94,10 @@ ut bootstd vbe_test_fixup @pytest.mark.boardspec('sandbox_flattree') @pytest.mark.requiredtool('dtc') def test_vbe(u_boot_console): + """Set up a FIT, boot it and check the fixups happened""" cons = u_boot_console kernel = fit_util.make_kernel(cons, 'vbe-kernel.bin', 'kernel') - fdt = fit_util.make_dtb(cons, base_fdt, 'vbe-fdt') + fdt = fit_util.make_dtb(cons, BASE_FDT, 'vbe-fdt') fdt_out = fit_util.make_fname(cons, 'fdt-out.dtb') params = { @@ -109,10 +113,10 @@ def test_vbe(u_boot_console): 'compression' : 'none', } mkimage = cons.config.build_dir + '/tools/mkimage' - fit = fit_util.make_fit(cons, mkimage, base_its, params, 'test-vbe.fit', - base_fdt) + fit = fit_util.make_fit(cons, mkimage, BASE_ITS, params, 'test-vbe.fit', + BASE_FDT) params['fit'] = fit - cmd = base_script % params + cmd = BASE_SCRIPT % params with cons.log.section('Kernel load'): output = cons.run_command_list(cmd.splitlines()) -- 2.37.3.998.g577e59143f-goog