commit 2d59d15d3021ed868e07c590091eb0dbbc321214
author Simon Glass <sjg@chromium.org> Mon Oct 18 12:13:15 2021 -0600
committer Simon Glass <sjg@chromium.org> Sun Oct 31 12:26:44 2021 -0600
tree fc516aafbce07a878f094520e77d0a1b33d5032d
parent e2b1e1f7cb455d90073329fc15ad88c6ca0ea225

binman: Allow timeout to occur in the image or its section

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>
Reviewed-by: Marek Behún <marek.behun@nic.cz>

tools/binman/ftest.py

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index cea3ebf..8199a4f 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -4565,8 +4565,7 @@
         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"""