Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/tinyfw_local_test' into 'master'

Browse source 
tiny-test-fw: restore the ability to run tests locally

See merge request espressif/esp-idf!6620
This commit is contained in:
Ivan Grokhotkov 2019-11-07 21:27:58 +08:00
parent c37cb2b5dc 6306ea5a92
commit dd7dd08bfb
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/tiny-test-fw/IDF/IDFDUT.py
View file

@ -122,9 +122,10 @@ def _uses_esptool(func):
settings = self.port_inst.get_settings()
try:
rom = self._get_rom()(self.port_inst)
rom.connect('hard_reset')
esp = rom.run_stub()
if not self._rom_inst:
self._rom_inst = esptool.ESPLoader.detect_chip(self.port_inst)
self._rom_inst.connect('hard_reset')
esp = self._rom_inst.run_stub()
ret = func(self, esp, *args, **kwargs)
# do hard reset after use esptool
@ -158,6 +159,7 @@ class IDFDUT(DUT.SerialDUT):
self.allow_dut_exception = allow_dut_exception
self.exceptions = _queue.Queue()
self.performance_items = _queue.Queue()
self._rom_inst = None
@classmethod
def _get_rom(cls):
@ -186,11 +188,16 @@ class IDFDUT(DUT.SerialDUT):
@classmethod
def confirm_dut(cls, port, app, **kwargs):
inst = None
try:
expected_rom_class = cls._get_rom()
except NotImplementedError:
expected_rom_class = None
try:
# TODO: check whether 8266 works with this logic
# Otherwise overwrite it in ESP8266DUT
inst = esptool.ESPLoader.detect_chip(port)
if type(inst) != cls._get_rom():
if expected_rom_class and type(inst) != expected_rom_class:
raise RuntimeError("Target not expected")
return inst.read_mac() is not None
except(esptool.FatalError, RuntimeError):