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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9C716C433EF for ; Thu, 14 Oct 2021 18:23:22 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DF0DB61037 for ; Thu, 14 Oct 2021 18:23:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DF0DB61037 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D40E383693; Thu, 14 Oct 2021 20:23:19 +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="bllLPf7d"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E4B1D837E1; Thu, 14 Oct 2021 20:23:14 +0200 (CEST) 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 63D63836E0 for ; Thu, 14 Oct 2021 20:23:06 +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 g2so4512838ild.1 for ; Thu, 14 Oct 2021 11:23:06 -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=bllLPf7dMaeQTdv6rlhMfIVxK0Mq7n9xqKei7a4TUuixB2xAoP/1qGYhwngiMOBLwO S0j3h1flanmbw7xHFv0GVXaUtUgOFH4Czj9wFMtjVS2XpgTbnVHzLrMk0chqs8vnHv6u pzWXZ7L1ubQbyiMn/LHrBfrWNQ5QXEqRWkW8k= 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=nXhFs6w5IlcQYcAtRK64sVsH08OHDmJfus7D0CPvY96wXL2P5KWTv+/qaEVrmnh2Wd SqzPgBfGZqFcTxFhoHCyW488xiX+wiuN/Te8Sc7NR819eEx1kYRASge+lyBJtjwlm/9u sVSApS0UBO6FQCDCmsETgTQGXUK9kYBL64eE/vbPDXPVoI9fL/mS3y5Rl6zDY3qoM2Fq b/7JNqKE8vVbC6OAckIFAMu7IMArsV3uPLeNkSweE1JXNK6o2A/seMXi/1kx6UGUgLG8 jc4CFoC+Fxqpri3mmKNT1u1PbXGq6tF+cDZvt3Ofa1qV3UWCzGHMv0xijnaILexup0p+ A86g== X-Gm-Message-State: AOAM530qsUkYwHZiLT/biSX6ib/uWjN4RTYofqgpf0+O2u2FHN4bNv+o GnA99ag1VSEt3+yAQBkYqiynYSYJNUax+w== X-Google-Smtp-Source: ABdhPJyroLMPL0SkliNgUi/xmcxlf+TrlLvsBTO/nwXGgqAxYh0JJD8zJAGqbj5HNl203MvKFb/Xwg== X-Received: by 2002:a05:6e02:170d:: with SMTP id u13mr391346ill.308.1634235784612; Thu, 14 Oct 2021 11:23:04 -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 h26sm1717536ila.4.2021.10.14.11.23.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Oct 2021 11:23:04 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Heinrich Schuchardt , Tom Rini , Wolfgang Denk , Simon Glass Subject: [PATCH v6 1/7] binman: Allow timeout to occur in the image or its section Date: Thu, 14 Oct 2021 12:22:51 -0600 Message-Id: <20211014182257.468649-2-sjg@chromium.org> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog In-Reply-To: <20211014182257.468649-1-sjg@chromium.org> References: <20211014182257.468649-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 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.2 at phobos.denx.de X-Virus-Status: Clean 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 --- (no changes since v1) tools/binman/ftest.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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""" -- 2.33.0.1079.g6e70778dc9-goog