Merge branch 'ci/raise_esptool_errors' into 'master'

ci: Don't swallow exception details from flashing process

See merge request espressif/esp-idf!11803
pull/6365/head
Angus Gratton 2020-12-30 11:22:57 +08:00
commit ec75f923ef
1 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -299,14 +299,15 @@ class IDFDUT(DUT.SerialDUT):
:param: erase_nvs: whether erase NVS partition during flash :param: erase_nvs: whether erase NVS partition during flash
:return: None :return: None
""" """
last_error = None
for baud_rate in [921600, 115200]: for baud_rate in [921600, 115200]:
try: try:
self._try_flash(erase_nvs, baud_rate) self._try_flash(erase_nvs, baud_rate)
break break
except RuntimeError: except RuntimeError as e:
continue last_error = e
else: else:
raise IDFToolError() raise last_error
@_uses_esptool @_uses_esptool
def reset(self, esp): def reset(self, esp):