[PATCH v2 07/11] binman: Avoid use of expected failure

Simon Glass sjg at chromium.org
Sat Aug 13 19:40:46 CEST 2022


The testReplaceSectionSimple() test is the only one which expects failure.
It looks odd in the output and takes time to glance at it to see that all
is in fact well. Also it does not check that the right exception is
generated.

Use the more common (in binman) approach of checking for an exception.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 tools/binman/ftest.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index 4f696c68600..ac54183c399 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -5712,14 +5712,15 @@ fdt         fdtmap                Extract the devicetree blob from the fdtmap
         self.assertIsNotNone(path)
         self.assertEqual(expected_fdtmap, fdtmap)
 
-    @unittest.expectedFailure
     def testReplaceSectionSimple(self):
         """Test replacing a simple section with arbitrary data"""
         new_data = b'w' * len(COMPRESS_DATA + U_BOOT_DATA)
-        data, expected_fdtmap, _ = self._RunReplaceCmd(
-            'section', new_data,
-            dts='234_replace_section_simple.dts')
-        self.assertEqual(new_data, data)
+        with self.assertRaises(ValueError) as exc:
+            self._RunReplaceCmd('section', new_data,
+                                dts='234_replace_section_simple.dts')
+        self.assertIn(
+            "Node '/section': Replacing sections is not implemented yet",
+            str(exc.exception))
 
 
 if __name__ == "__main__":
-- 
2.37.1.595.g718a3a8f04-goog



More information about the U-Boot mailing list