summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-10-18 12:13:15 -0600
committerSimon Glass <sjg@chromium.org>2021-10-31 12:26:44 -0600
commitb2dfe8382d9dff1f06ac703e736c1633b09bfca2 (patch)
treefc516aafbce07a878f094520e77d0a1b33d5032d
parent2289629f27f743003254d0a31ae9ed6175d1dd63 (diff)
downloadu-boot-b2dfe8382d9dff1f06ac703e736c1633b09bfca2.tar.gz
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>
-rw-r--r--tools/binman/ftest.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index cea3ebf2b9..8199a4fc7e 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"""