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 X-Spam-Level: X-Spam-Status: No, score=-19.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57DD7C433EF for ; Wed, 8 Sep 2021 13:37:42 +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 CE73561164 for ; Wed, 8 Sep 2021 13:37:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org CE73561164 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 7B6188346E; Wed, 8 Sep 2021 15:35:41 +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="DvGGvrAs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6D9A6833ED; Wed, 8 Sep 2021 15:34:53 +0200 (CEST) Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) (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 98F3E833CE for ; Wed, 8 Sep 2021 15:34:42 +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-wr1-x434.google.com with SMTP id v10so3361231wrd.4 for ; Wed, 08 Sep 2021 06:34:42 -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=ZtS/C0gCve7ZYYVLH0yirlP73suW2ymYzB/pKu7hB7Y=; b=DvGGvrAsHlWdR/IsgHEgw3RYDfhu6Jj98Oirqvu5Coos7JE+ar6bqFRs7IkNpu8O2d aDTT00iLCxwsO7FBDm1ALRvsX/g7rDcdEZ4BlLwSGp34IpdIxhj7dQK0FjPTnT296osK elVDrpsfZ+qiORlKNWIo+UaE4v4j8YCryjsVQ= 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=ZtS/C0gCve7ZYYVLH0yirlP73suW2ymYzB/pKu7hB7Y=; b=Oa8QnIFu/Nm9b8CwVdppZr8Y+IlE/9kFzN2GpkM1ZdSKeXxlOGI5jasKmfYInWhoNN TYyWoZlFFxOdqIwbE7806JkvyX9ZWO9+a1SA+aW/bUQvVjvxu30VFTFTEKIlJ3quOHGj z9MHnnu44w5qMFEhLNsqMbnbLfC06g2XAjzwtH+cfmskvE4AiTKwC2R/dYLhTW9NYkNV rBN1nYaJhXSm9oQA1fD1dcmXZ6wlEDtvhqdSqeuBRluWWPwuL+WrjjWgmOz2Ia6ox4FQ 6D5rdgkZojvTF2JnH5onk3yVgKbXyz9tAhUbKTzhhEPzCo4mUZxHvRq/JKFanPQ5ciUy RIHg== X-Gm-Message-State: AOAM532M+AAjTUtOlYkCkemyLg9MtIg58yeXm94WFp+vyYHARg8kxw3O VpAGxKgcY3JESC7RAqkIoReitpuw1G5wqeu1 X-Google-Smtp-Source: ABdhPJwRYjQSFLmobSIVG/Z2GjpkBN0OpkW8v982gXQFHRWEImfFC6M8mST1ojTNZY2NF5EBppt+FA== X-Received: by 2002:adf:e10c:: with SMTP id t12mr4269766wrz.36.1631108081705; Wed, 08 Sep 2021 06:34:41 -0700 (PDT) Received: from sjg1.roam.corp.google.com (82-69-54-180.dsl.in-addr.zen.co.uk. [82.69.54.180]) by smtp.gmail.com with ESMTPSA id l2sm2209065wmi.1.2021.09.08.06.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Sep 2021 06:34:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Ilias Apalodimas , Heinrich Schuchardt , Bin Meng , Tom Rini , Christian Melki , Simon Glass Subject: [PATCH 18/35] binman: Allow timeout to occur in the image or its section Date: Wed, 8 Sep 2021 07:33:48 -0600 Message-Id: <20210908073355.18.I45633114ca976ec492b947ac8ceb05a257485d9f@changeid> X-Mailer: git-send-email 2.33.0.153.gba50c8fa24-goog In-Reply-To: <20210908133405.696481-1-sjg@chromium.org> References: <20210908133405.696481-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 --- 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.153.gba50c8fa24-goog