Message ID | 20211025213041.v3.15.I45633114ca976ec492b947ac8ceb05a257485d9f@changeid |
---|---|
State | Accepted, archived |
Commit | b2dfe8382d9dff1f06ac703e736c1633b09bfca2 |
Delegated to: | Heinrich Schuchardt |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=M4qNv3NJ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4HdcrK619Vz9sRN for <incoming@patchwork.ozlabs.org>; Tue, 26 Oct 2021 14:34:25 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 327D583600; Tue, 26 Oct 2021 05:33:10 +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="M4qNv3NJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 97F8983564; Tue, 26 Oct 2021 05:31:34 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 ACD6283599 for <u-boot@lists.denx.de>; Tue, 26 Oct 2021 05:31:21 +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-il1-x12b.google.com with SMTP id h2so15378530ili.11 for <u-boot@lists.denx.de>; Mon, 25 Oct 2021 20:31:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T0dGZ4n5EWRAMGoqKMnG4sYoddpZvoNdSLWi72p635A=; b=M4qNv3NJNIqHHBp2H84QPb1J1tY4gJi3fvrr3vlMXcCkhiMvEtkDWhWzKIgoHLZlEC ejgEv1ODA5MnGWWSiGFcdTuxYqPXEH594BlfE5RYjSrBy5fmSPCH0SQJaY4X4cVSerw+ l7Fag9rdUVOHOBsU347zMDVEPFtEVjqXJ5Dis= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T0dGZ4n5EWRAMGoqKMnG4sYoddpZvoNdSLWi72p635A=; b=W3ULYw1Qgmr8VSJCo/5g0Psp1gZ12id9poM8oaaIUzU5/SqF5dy3nHOqYpx07Qqa+j YaEY8rLarbXx5LDarvTLtBXzk4w5cXrIWxentF0p0koTJ4DHDVhefPGdiCm6E1EmKtkT PJLMFR+QUfW1jC/jZqXwHEIw0/YjDKLexuPrgFqpznyU5Ib3gXb1Ms6wmCkeEdXDXRVc lqTpSQDXKJz7iNbkij7/yIeJx6HOiDghKCv9uI6GbVk+WAb0/hQcC0kzexTSKAjcWIS+ Vmw1eMvAqqcaJeT1WQqW9VEGf4DAG8X9o5E9QFN4QrlpNyIPt3nuDYMiVhjJ/Qf1wWse ygAA== X-Gm-Message-State: AOAM530/w3N/mOFhFn3Mmn/Wap2I9ton4KBV/J+VaZ1tw28xPY7zelnY 6tPX5Q4+r/ATYmvdhtq8aj5F/+sgjpgA3g== X-Google-Smtp-Source: ABdhPJzsUqg9bg5CL4kqUk7Dg5vhoLHEUk0fOtPlmvRtoBrCBMNCscbKE8bLduRSaOiw4M4hVEae/A== X-Received: by 2002:a92:cd50:: with SMTP id v16mr13186605ilq.90.1635219080195; Mon, 25 Oct 2021 20:31:20 -0700 (PDT) Received: from kiwi.bld.corp.google.com (c-67-190-101-114.hsd1.co.comcast.net. [67.190.101.114]) by smtp.gmail.com with ESMTPSA id s10sm10127203ild.78.2021.10.25.20.31.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Oct 2021 20:31:19 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>, Christian Melki <christian.melki@t2data.com>, Bin Meng <bmeng.cn@gmail.com>, Tom Rini <trini@konsulko.com>, Heinrich Schuchardt <xypron.glpk@gmx.de>, Simon Glass <sjg@chromium.org> Subject: [PATCH v3 15/35] binman: Allow timeout to occur in the image or its section Date: Mon, 25 Oct 2021 21:30:38 -0600 Message-Id: <20211025213041.v3.15.I45633114ca976ec492b947ac8ceb05a257485d9f@changeid> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211026033058.430010-1-sjg@chromium.org> References: <20211026033058.430010-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <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>, <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.2 at phobos.denx.de X-Virus-Status: Clean |
Series |
efi: Improvements to U-Boot running on top of UEFI
|
expand
|
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index cea3ebf2b9f..8199a4fc7e0 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -4565,8 +4565,7 @@ class TestFunctional(unittest.TestCase): with self.assertRaises(ValueError) as e: self._DoTestFile('202_section_timeout.dts', test_section_timeout=True) - self.assertIn("Node '/binman/section@0': Timed out obtaining contents", - str(e.exception)) + self.assertIn("Timed out obtaining contents", str(e.exception)) def testTiming(self): """Test output of timing information"""
At present testThreadTimeout() assumes that the expected timeout happens first when building the section, but it can just as easily happen at the top-level image. Update the test to cope with both. Signed-off-by: Simon Glass <sjg@chromium.org> --- (no changes since v1) tools/binman/ftest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)