Commit b6ee0cf8 authored by Simon Glass's avatar Simon Glass
Browse files

binman: Convert a few tests to Python 3



Some tests have crept in with Python 2 strings and constructs. Convert
then.
Signed-off-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>
parent 9a5d3dcf
...@@ -2113,7 +2113,7 @@ class TestFunctional(unittest.TestCase): ...@@ -2113,7 +2113,7 @@ class TestFunctional(unittest.TestCase):
data = self.data = self._DoReadFileRealDtb('115_fdtmap.dts') data = self.data = self._DoReadFileRealDtb('115_fdtmap.dts')
fdtmap_data = data[len(U_BOOT_DATA):] fdtmap_data = data[len(U_BOOT_DATA):]
magic = fdtmap_data[:8] magic = fdtmap_data[:8]
self.assertEqual('_FDTMAP_', magic) self.assertEqual(b'_FDTMAP_', magic)
self.assertEqual(tools.GetBytes(0, 8), fdtmap_data[8:16]) self.assertEqual(tools.GetBytes(0, 8), fdtmap_data[8:16])
fdt_data = fdtmap_data[16:] fdt_data = fdtmap_data[16:]
...@@ -2156,7 +2156,7 @@ class TestFunctional(unittest.TestCase): ...@@ -2156,7 +2156,7 @@ class TestFunctional(unittest.TestCase):
dtb = fdt.Fdt.FromData(fdt_data) dtb = fdt.Fdt.FromData(fdt_data)
fdt_size = dtb.GetFdtObj().totalsize() fdt_size = dtb.GetFdtObj().totalsize()
hdr_data = data[-8:] hdr_data = data[-8:]
self.assertEqual('BinM', hdr_data[:4]) self.assertEqual(b'BinM', hdr_data[:4])
offset = struct.unpack('<I', hdr_data[4:])[0] & 0xffffffff offset = struct.unpack('<I', hdr_data[4:])[0] & 0xffffffff
self.assertEqual(fdtmap_pos - 0x400, offset - (1 << 32)) self.assertEqual(fdtmap_pos - 0x400, offset - (1 << 32))
...@@ -2165,7 +2165,7 @@ class TestFunctional(unittest.TestCase): ...@@ -2165,7 +2165,7 @@ class TestFunctional(unittest.TestCase):
data = self.data = self._DoReadFileRealDtb('117_fdtmap_hdr_start.dts') data = self.data = self._DoReadFileRealDtb('117_fdtmap_hdr_start.dts')
fdtmap_pos = 0x100 + len(U_BOOT_DATA) fdtmap_pos = 0x100 + len(U_BOOT_DATA)
hdr_data = data[:8] hdr_data = data[:8]
self.assertEqual('BinM', hdr_data[:4]) self.assertEqual(b'BinM', hdr_data[:4])
offset = struct.unpack('<I', hdr_data[4:])[0] offset = struct.unpack('<I', hdr_data[4:])[0]
self.assertEqual(fdtmap_pos, offset) self.assertEqual(fdtmap_pos, offset)
...@@ -2174,7 +2174,7 @@ class TestFunctional(unittest.TestCase): ...@@ -2174,7 +2174,7 @@ class TestFunctional(unittest.TestCase):
data = self.data = self._DoReadFileRealDtb('118_fdtmap_hdr_pos.dts') data = self.data = self._DoReadFileRealDtb('118_fdtmap_hdr_pos.dts')
fdtmap_pos = 0x100 + len(U_BOOT_DATA) fdtmap_pos = 0x100 + len(U_BOOT_DATA)
hdr_data = data[0x80:0x88] hdr_data = data[0x80:0x88]
self.assertEqual('BinM', hdr_data[:4]) self.assertEqual(b'BinM', hdr_data[:4])
offset = struct.unpack('<I', hdr_data[4:])[0] offset = struct.unpack('<I', hdr_data[4:])[0]
self.assertEqual(fdtmap_pos, offset) self.assertEqual(fdtmap_pos, offset)
...@@ -2435,9 +2435,9 @@ class TestFunctional(unittest.TestCase): ...@@ -2435,9 +2435,9 @@ class TestFunctional(unittest.TestCase):
' section 100 %x section 100' % section_size, ' section 100 %x section 100' % section_size,
' cbfs 100 400 cbfs 0', ' cbfs 100 400 cbfs 0',
' u-boot 138 4 u-boot 38', ' u-boot 138 4 u-boot 38',
' u-boot-dtb 180 10f u-boot-dtb 80 3c9', ' u-boot-dtb 180 105 u-boot-dtb 80 3c9',
' u-boot-dtb 500 %x u-boot-dtb 400 3c9' % fdt_size, ' u-boot-dtb 500 %x u-boot-dtb 400 3c9' % fdt_size,
' fdtmap %x 3b4 fdtmap %x' % ' fdtmap %x 3bd fdtmap %x' %
(fdtmap_offset, fdtmap_offset), (fdtmap_offset, fdtmap_offset),
' image-header bf8 8 image-header bf8', ' image-header bf8 8 image-header bf8',
] ]
...@@ -2522,7 +2522,7 @@ class TestFunctional(unittest.TestCase): ...@@ -2522,7 +2522,7 @@ class TestFunctional(unittest.TestCase):
data = self._RunExtractCmd('section') data = self._RunExtractCmd('section')
cbfs_data = data[:0x400] cbfs_data = data[:0x400]
cbfs = cbfs_util.CbfsReader(cbfs_data) cbfs = cbfs_util.CbfsReader(cbfs_data)
self.assertEqual(['u-boot', 'u-boot-dtb', ''], cbfs.files.keys()) self.assertEqual(['u-boot', 'u-boot-dtb', ''], list(cbfs.files.keys()))
dtb_data = data[0x400:] dtb_data = data[0x400:]
dtb = self._decompress(dtb_data) dtb = self._decompress(dtb_data)
self.assertEqual(EXTRACT_DTB_SIZE, len(dtb)) self.assertEqual(EXTRACT_DTB_SIZE, len(dtb))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment