Re: [PATCH 6/7] binman: Test replacing non-section entries in FIT subsections

2022-04-19 Thread Simon Glass
On Sun, 27 Mar 2022 at 09:32, Alper Nebi Yasak  wrote:
>
> A previous patch fixes binman to correctly extract FIT subentries. This
> makes it easier to test replacing these entries as we can write tests
> using an existing helper function that relies on extracting the replaced
> entry.
>
> Add tests that replace leaf entries in FIT subsections with data of
> various sizes. Replacing the subsections or the whole FIT section does
> not work yet due to the section contents being re-built from unreplaced
> subentries' data.
>
> Signed-off-by: Alper Nebi Yasak 
> ---
>
>  tools/binman/ftest.py | 38 ++
>  1 file changed, 38 insertions(+)

Reviewed-by: Simon Glass 


[PATCH 6/7] binman: Test replacing non-section entries in FIT subsections

2022-03-27 Thread Alper Nebi Yasak
A previous patch fixes binman to correctly extract FIT subentries. This
makes it easier to test replacing these entries as we can write tests
using an existing helper function that relies on extracting the replaced
entry.

Add tests that replace leaf entries in FIT subsections with data of
various sizes. Replacing the subsections or the whole FIT section does
not work yet due to the section contents being re-built from unreplaced
subentries' data.

Signed-off-by: Alper Nebi Yasak 
---

 tools/binman/ftest.py | 38 ++
 1 file changed, 38 insertions(+)

diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py
index a31568997f6f..43bec4a88841 100644
--- a/tools/binman/ftest.py
+++ b/tools/binman/ftest.py
@@ -5603,6 +5603,44 @@ def testExtractFitSubentries(self):
 data = control.ReadEntry(image_fname, entry_path)
 self.assertEqual(expected, data)
 
+def testReplaceFitSubentryLeafSameSize(self):
+"""Test replacing a FIT leaf subentry with same-size data"""
+new_data = b'x' * len(U_BOOT_DATA)
+data, expected_fdtmap, _ = self._RunReplaceCmd(
+'fit/kernel/u-boot', new_data,
+dts='233_fit_extract_replace.dts')
+self.assertEqual(new_data, data)
+
+path, fdtmap = state.GetFdtContents('fdtmap')
+self.assertIsNotNone(path)
+self.assertEqual(expected_fdtmap, fdtmap)
+
+def testReplaceFitSubentryLeafBiggerSize(self):
+"""Test replacing a FIT leaf subentry with bigger-size data"""
+new_data = b'ub' * len(U_BOOT_NODTB_DATA)
+data, expected_fdtmap, _ = self._RunReplaceCmd(
+'fit/fdt-1/u-boot-nodtb', new_data,
+dts='233_fit_extract_replace.dts')
+self.assertEqual(new_data, data)
+
+# Will be repacked, so fdtmap must change
+path, fdtmap = state.GetFdtContents('fdtmap')
+self.assertIsNotNone(path)
+self.assertNotEqual(expected_fdtmap, fdtmap)
+
+def testReplaceFitSubentryLeafSmallerSize(self):
+"""Test replacing a FIT leaf subentry with smaller-size data"""
+new_data = b'x'
+expected = new_data.ljust(len(U_BOOT_NODTB_DATA), b'\0')
+data, expected_fdtmap, _ = self._RunReplaceCmd(
+'fit/fdt-1/u-boot-nodtb', new_data,
+dts='233_fit_extract_replace.dts')
+self.assertEqual(expected, data)
+
+path, fdtmap = state.GetFdtContents('fdtmap')
+self.assertIsNotNone(path)
+self.assertEqual(expected_fdtmap, fdtmap)
+
 
 if __name__ == "__main__":
 unittest.main()
-- 
2.35.1