espressif/esptool
1
0
Fork 0
mirror of https://github.com/espressif/esptool.git synced 2025-10-16 23:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(test/esptool): Updated tests according to SHA recomputation for binary

Browse Source
This commit is contained in:
Jakub Kocka
2024-02-28 12:49:32 +01:00
committed by Radim Karniš
parent 8d2637532a
commit 598b7034ce
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esptool/cmds.py
View File

@@ -239,9 +239,7 @@ def detect_flash_size(esp, args=None):
return flash_size
def _update_image_flash_params(
esp, address, args, image
): # TODO check the flash params if they are valid
def _update_image_flash_params(esp, address, args, image):
"""
Modify the flash mode & size bytes if this looks like an executable bootloader image
"""

17
test/test_esptool.py
View File

@@ -1043,11 +1043,7 @@ class TestKeepImageSettings(EsptoolTestCase):
)
readback = self.readback(self.flash_offset, 8)
assert self.header[:3] == readback[:3] # first 3 bytes unchanged
if arg_chip in ["esp8266", "esp32"]:
assert self.header[3] != readback[3] # size_freq byte changed
else:
# Not changed because protected by SHA256 digest
assert self.header[3] == readback[3] # size_freq byte unchanged
assert self.header[3] != readback[3] # size_freq byte changed
assert self.header[4:] == readback[4:] # rest unchanged
@pytest.mark.skipif(
@@ -1171,13 +1167,12 @@ class TestBootloaderHeaderRewriteCases(EsptoolTestCase):
f"write_flash -fm dout -ff 20m {bl_offset:#x} {bl_image}"
)
if arg_chip in ["esp8266", "esp32"]:
# There is no SHA256 digest so the header can be changed - ESP8266 doesn't
# support this; The test image for ESP32 just doesn't have it.
"Flash params set to" in output
# ESP8266 doesn't support this; The test image for ESP32 just doesn't have it.
assert "Flash params set to" in output
else:
assert "Flash params set to" not in output
"not changing the flash mode setting" in output
"not changing the flash frequency setting" in output
assert "Flash params set to" in output
# Since SHA recalculation is supported for changed bootloader header
assert "SHA digest in image updated" in output
def test_flash_header_no_magic_no_rewrite(self):
# first image doesn't start with magic byte, second image does