All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Glass <sjg@chromium.org>
To: U-Boot Mailing List <u-boot@lists.denx.de>
Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>,
	Tom Rini <trini@konsulko.com>, Wolfgang Denk <wd@denx.de>,
	Simon Glass <sjg@chromium.org>
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	[thread overview]
Message-ID: <20211014182257.468649-2-sjg@chromium.org> (raw)
In-Reply-To: <20211014182257.468649-1-sjg@chromium.org>

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(-)

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


  reply	other threads:[~2021-10-14 18:23 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-14 18:22 [PATCH v6 0/7] env: Allow environment in text files Simon Glass
2021-10-14 18:22 ` Simon Glass [this message]
2021-10-14 18:22 ` [PATCH v6 2/7] sandbox: Drop distro_boot Simon Glass
2021-10-14 18:22 ` [PATCH v6 3/7] doc: Move environment documentation to rST Simon Glass
2021-10-14 18:22 ` [PATCH v6 4/7] env: Allow U-Boot scripts to be placed in a .env file Simon Glass
2021-10-15 14:32   ` Wolfgang Denk
2021-10-15 15:15     ` Simon Glass
2021-10-18 11:58       ` Wolfgang Denk
2021-10-18 13:37         ` Tom Rini
2021-10-18 14:10           ` Wolfgang Denk
2021-10-18 14:24             ` Tom Rini
2021-10-19 10:33               ` Wolfgang Denk
2021-10-18 18:12             ` Simon Glass
2021-10-19 10:38               ` Wolfgang Denk
2021-10-18 18:12         ` Simon Glass
2021-10-19 10:46           ` Wolfgang Denk
2021-10-19 14:11             ` Simon Glass
2021-10-19 16:09               ` Wolfgang Denk
2021-10-19 16:14                 ` Simon Glass
2021-10-14 18:22 ` [PATCH v6 5/7] sandbox: Use a text-based environment Simon Glass
2021-10-14 18:22 ` [PATCH v6 6/7] doc: Improve environment documentation Simon Glass
2021-10-14 18:22 ` [PATCH v6 7/7] bootm: Tidy up use of autostart env var Simon Glass
2021-10-15 14:45   ` Wolfgang Denk
2021-10-24 19:53     ` Simon Glass

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211014182257.468649-2-sjg@chromium.org \
    --to=sjg@chromium.org \
    --cc=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    --cc=wd@denx.de \
    --cc=xypron.glpk@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.