alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-11-26 20:53:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Allow per-unit-test timeouts

Browse Source 
Work around for "(WL) write/read speed test" taking >30s in some configs
This commit is contained in:
Angus Gratton
2018-05-21 14:50:27 +10:00
committed by bot
parent 92c469b599
commit e8525396dd
6 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/unit-test-app/unit_test.py
View File

@@ -27,7 +27,8 @@ RESET_PATTERN = re.compile(r"(ets [\w]{3}\s+[\d]{1,2} [\d]{4} [\d]{2}:[\d]{2}:[\
EXCEPTION_PATTERN = re.compile(r"(Guru Meditation Error: Core\s+\d panic'ed \([\w].*?\))")
ABORT_PATTERN = re.compile(r"(abort\(\) was called at PC 0x[a-eA-E\d]{8} on core \d)")
FINISH_PATTERN = re.compile(r"1 Tests (\d) Failures (\d) Ignored")
UT_TIMEOUT = 30
STARTUP_TIMEOUT=10
def format_test_case_config(test_case_data):
@@ -142,7 +143,7 @@ def run_unit_test_cases(env, extra_data):
# to determine if DUT is ready to test.
dut.write("-", flush=False)
dut.expect_any(UT_APP_BOOT_UP_DONE,
"0 Tests 0 Failures 0 Ignored", timeout=UT_TIMEOUT)
"0 Tests 0 Failures 0 Ignored", timeout=STARTUP_TIMEOUT)
# run test case
dut.write("\"{}\"".format(one_case["name"]))
@@ -203,7 +204,7 @@ def run_unit_test_cases(env, extra_data):
(ABORT_PATTERN, handle_exception_reset),
(FINISH_PATTERN, handle_test_finish),
(UT_APP_BOOT_UP_DONE, handle_reset_finish),
timeout=UT_TIMEOUT)
timeout=one_case["timeout"])
except ExpectTimeout:
Utility.console_log("Timeout in expect", color="orange")
one_case_finish(False)
@@ -223,7 +224,7 @@ class Handler(threading.Thread):
SEND_SIGNAL_PATTERN = re.compile(r'Send signal: \[(.+)\]!')
FINISH_PATTERN = re.compile(r"1 Tests (\d) Failures (\d) Ignored")
def __init__(self, dut, sent_signal_list, lock, parent_case_name, child_case_index, timeout=30):
def __init__(self, dut, sent_signal_list, lock, parent_case_name, child_case_index, timeout):
self.dut = dut
self.sent_signal_list = sent_signal_list
self.lock = lock
@@ -288,7 +289,7 @@ class Handler(threading.Thread):
(self.WAIT_SIGNAL_PATTERN, device_wait_action), # wait signal pattern
(self.SEND_SIGNAL_PATTERN, device_send_action), # send signal pattern
(self.FINISH_PATTERN, handle_device_test_finish), # test finish pattern
timeout=UT_TIMEOUT)
timeout=self.timeout)
except ExpectTimeout:
Utility.console_log("Timeout in expect", color="orange")
one_device_case_finish(False)
@@ -321,7 +322,7 @@ def case_run(duts, ut_config, env, one_case, failed_cases):
for i in range(case_num):
dut = get_dut(duts, env, "dut%d" % i, ut_config)
threads.append(Handler(dut, send_signal_list, lock,
parent_case, i))
parent_case, i, one_case["timeout"]))
for thread in threads:
thread.setDaemon(True)
thread.start()
@@ -487,7 +488,7 @@ def run_multiple_stage_cases(env, extra_data):
(ABORT_PATTERN, handle_exception_reset),
(FINISH_PATTERN, handle_test_finish),
(UT_APP_BOOT_UP_DONE, handle_next_stage),
timeout=UT_TIMEOUT)
timeout=one_case["timeout"])
except ExpectTimeout:
Utility.console_log("Timeout in expect", color="orange")
one_case_finish(False)