j3d1/esp-open-rtos
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tests:Relax read timeouts, some NodeMCU ESPs take longer to reset than others (flash type?)

Browse source
This commit is contained in:
Angus Gratton 2016-02-17 16:58:44 +11:00
parent b2b1e42c59
commit a109a19799
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tests/test_runner.py
View file

@ -9,7 +9,7 @@ import re
import time import time
import traceback import traceback
TEST_RESET_TIMEOUT=0.1 SHORT_OUTPUT_TIMEOUT=0.25 # timeout for resetting and/or waiting for more lines of output
TESTCASE_TIMEOUT=10 TESTCASE_TIMEOUT=10
TESTRUNNER_BANNER="esp-open-rtos test runner." TESTRUNNER_BANNER="esp-open-rtos test runner."
@ -150,12 +150,12 @@ class TestMonitor(object):
def _monitorThread(self): def _monitorThread(self):
self.output = "" self.output = ""
start_time = time.time() start_time = time.time()
self._port.timeout = 0.1 self._port.timeout = SHORT_OUTPUT_TIMEOUT
try: try:
while not self._cancelled and time.time() < start_time + TESTCASE_TIMEOUT: while not self._cancelled and time.time() < start_time + TESTCASE_TIMEOUT:
line = self._port.readline().decode("utf-8", "ignore") line = self._port.readline().decode("utf-8", "ignore")
if line == "": if line == "":
line = "(TIMED OUT)\r\n" continue # timed out
self.output += "%s+%4.2fs %s" % (self._instance, time.time()-start_time, line) self.output += "%s+%4.2fs %s" % (self._instance, time.time()-start_time, line)
verbose_print(line.strip()) verbose_print(line.strip())
if line.endswith(":PASS\r\n"): if line.endswith(":PASS\r\n"):
@ -292,7 +292,7 @@ class TestSerialPort(serial.Serial):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(TestSerialPort, self).__init__(*args, **kwargs) super(TestSerialPort, self).__init__(*args, **kwargs)
def wait_line(self, callback, timeout = TEST_RESET_TIMEOUT): def wait_line(self, callback, timeout = SHORT_OUTPUT_TIMEOUT):
""" Wait for the port to output a particular piece of line content, as judged by callback """ Wait for the port to output a particular piece of line content, as judged by callback
Callback called as 'callback(line)' and returns not-True if non-match otherwise can return any value. Callback called as 'callback(line)' and returns not-True if non-match otherwise can return any value.