From b2dfe8382d9dff1f06ac703e736c1633b09bfca2 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 18 Oct 2021 12:13:15 -0600 Subject: binman: Allow timeout to occur in the image or its section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Behún --- 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 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""" -- cgit v1.2.1