[PATCH v8 1/8] binman: Allow timeout to occur in the image or its section

Simon Glass
2021-10-18T18:14:06Z

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