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

fix(tests/intelhex): make sure file is closed on Windows

Browse Source
This commit is contained in:
Peter Dragun
2023-11-07 15:37:53 +01:00
committed by Roland Dobai
parent afaa7d2753
commit 900d38557d
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
test/test_esptool.py
View File

@@ -396,22 +396,27 @@ class TestFlashing(EsptoolTestCase):
self.verify_readback(4096, 50 * 1024, "images/fifty_kb.bin") self.verify_readback(4096, 50 * 1024, "images/fifty_kb.bin")
def test_short_flash_hex(self): def test_short_flash_hex(self):
_, f = tempfile.mkstemp(suffix=".hex") fd, f = tempfile.mkstemp(suffix=".hex")
try: try:
self.run_esptool(f"merge_bin --format hex 0x0 images/one_kb.bin -o {f}") self.run_esptool(f"merge_bin --format hex 0x0 images/one_kb.bin -o {f}")
# make sure file is closed before running next command (mainly for Windows)
os.close(fd)
self.run_esptool(f"write_flash 0x0 {f}") self.run_esptool(f"write_flash 0x0 {f}")
self.verify_readback(0, 1024, "images/one_kb.bin") self.verify_readback(0, 1024, "images/one_kb.bin")
finally: finally:
os.unlink(f) os.unlink(f)
def test_adjacent_flash_hex(self): def test_adjacent_flash_hex(self):
_, f1 = tempfile.mkstemp(suffix=".hex") fd1, f1 = tempfile.mkstemp(suffix=".hex")
_, f2 = tempfile.mkstemp(suffix=".hex") fd2, f2 = tempfile.mkstemp(suffix=".hex")
try: try:
self.run_esptool(f"merge_bin --format hex 0x0 images/sector.bin -o {f1}") self.run_esptool(f"merge_bin --format hex 0x0 images/sector.bin -o {f1}")
# make sure file is closed before running next command (mainly for Windows)
os.close(fd1)
self.run_esptool( self.run_esptool(
f"merge_bin --format hex 0x1000 images/fifty_kb.bin -o {f2}" f"merge_bin --format hex 0x1000 images/fifty_kb.bin -o {f2}"
) )
os.close(fd2)
self.run_esptool(f"write_flash 0x0 {f1} 0x1000 {f2}") self.run_esptool(f"write_flash 0x0 {f1} 0x1000 {f2}")
self.verify_readback(0, 4096, "images/sector.bin") self.verify_readback(0, 4096, "images/sector.bin")
self.verify_readback(4096, 50 * 1024, "images/fifty_kb.bin") self.verify_readback(4096, 50 * 1024, "images/fifty_kb.bin")
@@ -420,11 +425,13 @@ class TestFlashing(EsptoolTestCase):
os.unlink(f2) os.unlink(f2)
def test_adjacent_flash_mixed(self): def test_adjacent_flash_mixed(self):
_, f = tempfile.mkstemp(suffix=".hex") fd, f = tempfile.mkstemp(suffix=".hex")
try: try:
self.run_esptool( self.run_esptool(
f"merge_bin --format hex 0x1000 images/fifty_kb.bin -o {f}" f"merge_bin --format hex 0x1000 images/fifty_kb.bin -o {f}"
) )
# make sure file is closed before running next command (mainly for Windows)
os.close(fd)
self.run_esptool(f"write_flash 0x0 images/sector.bin 0x1000 {f}") self.run_esptool(f"write_flash 0x0 images/sector.bin 0x1000 {f}")
self.verify_readback(0, 4096, "images/sector.bin") self.verify_readback(0, 4096, "images/sector.bin")
self.verify_readback(4096, 50 * 1024, "images/fifty_kb.bin") self.verify_readback(4096, 50 * 1024, "images/fifty_kb.bin")
@@ -1063,12 +1070,14 @@ class TestLoadRAM(EsptoolTestCase):
The "hello world" binary programs for each chip print The "hello world" binary programs for each chip print
"Hello world!\n" to the serial port. "Hello world!\n" to the serial port.
""" """
_, f = tempfile.mkstemp(suffix=".hex") fd, f = tempfile.mkstemp(suffix=".hex")
try: try:
self.run_esptool( self.run_esptool(
f"merge_bin --format hex -o {f} 0x0 " f"merge_bin --format hex -o {f} 0x0 "
f"images/ram_helloworld/helloworld-{arg_chip}.bin" f"images/ram_helloworld/helloworld-{arg_chip}.bin"
) )
# make sure file is closed before running next command (mainly for Windows)
os.close(fd)
self.run_esptool(f"load_ram {f}") self.run_esptool(f"load_ram {f}")
self.verify_output( self.verify_output(
[b"Hello world!", b'\xce?\x13\x05\x04\xd0\x97A\x11"\xc4\x06\xc67\x04'] [b"Hello world!", b'\xce?\x13\x05\x04\xd0\x97A\x11"\xc4\x06\xc67\x04']

10
test/test_merge_bin.py
View File

@@ -252,11 +252,11 @@ class TestMergeBin:
# convert back and verify the result against the source bin file # convert back and verify the result against the source bin file
with tempfile.NamedTemporaryFile(suffix=".hex", delete=False) as hex: with tempfile.NamedTemporaryFile(suffix=".hex", delete=False) as hex:
hex.write(merged) hex.write(merged)
merged_bin = self.run_merge_bin( merged_bin = self.run_merge_bin(
"esp32", "esp32",
[(0x1000, hex.name)], [(0x1000, hex.name)],
options=["--format", "raw"], options=["--format", "raw"],
) )
source = read_image("bootloader_esp32.bin") source = read_image("bootloader_esp32.bin")
# verify that padding was done correctly # verify that padding was done correctly
assert b"\xFF" * 0x1000 == merged_bin[:0x1000] assert b"\xFF" * 0x1000 == merged_bin[:0x1000]