binman: Test replacing non-section entries in FIT subsections

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 <alpernebiyasak@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Alper Nebi Yasak 2022-03-27 18:31:49 +03:00 committed by Tom Rini
parent 74d3b2311d
commit 99283e5389

View File

@ -5655,6 +5655,44 @@ fdt fdtmap Extract the devicetree blob from the fdtmap
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()