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

test: fix UT script can't process cmd after reset:

Browse source 
There's still a small chance that can't process command issue still
happen on some runners. Now we change the way to detect if the runner
reset finished: input `-` to check test history for a few times until it
succeeded. If DUT can process check history command, then it should be
able to process other test commands.
This commit is contained in:
He Yin Ling 2018-09-25 15:04:16 +08:00 committed by bot
parent f55509bd3f
commit 2b4e34171b
1 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/unit-test-app/unit_test.py
View file

@ -53,9 +53,12 @@ SIMPLE_TEST_ID = 0
MULTI_STAGE_ID = 1 MULTI_STAGE_ID = 1
MULTI_DEVICE_ID = 2 MULTI_DEVICE_ID = 2
STARTUP_TIMEOUT=10
DEFAULT_TIMEOUT=20 DEFAULT_TIMEOUT=20
DUT_STARTUP_CHECK_RETRY_COUNT = 5
TEST_HISTROY_CHECK_TIMEOUT = 1
def format_test_case_config(test_case_data): def format_test_case_config(test_case_data):
""" """
convert the test case data to unified format. convert the test case data to unified format.
@ -139,19 +142,22 @@ def replace_app_bin(dut, name, new_app_bin):
Utility.console_log("The replaced application binary is {}".format(new_app_bin), "O") Utility.console_log("The replaced application binary is {}".format(new_app_bin), "O")
break break
def reset_dut(dut): def reset_dut(dut):
# We do flush before test, in case we already have bootup pattern in data cache
dut.write("", flush=True)
dut.reset() dut.reset()
# esptool ``run`` cmd takes quite long time. # esptool ``run`` cmd takes quite long time.
# before reset finish, serial port is closed. therefore DUT could already bootup before serial port opened. # before reset finish, serial port is closed. therefore DUT could already bootup before serial port opened.
# this could cause checking bootup print failed. # this could cause checking bootup print failed.
# now we input cmd `-`, and check either bootup print or test history, # now use input cmd `-` and check test history to check if DUT is bootup.
# to determine if DUT is ready to test. # we'll retry this step for a few times in case `dut.reset` returns during DUT bootup (when DUT can't process any command).
dut.write("-", flush=False) for _ in range(DUT_STARTUP_CHECK_RETRY_COUNT):
dut.expect_any(UT_APP_BOOT_UP_DONE, dut.write("-")
"0 Tests 0 Failures 0 Ignored", timeout=STARTUP_TIMEOUT) try:
dut.expect("0 Tests 0 Failures 0 Ignored", timeout=TEST_HISTROY_CHECK_TIMEOUT)
break
except ExpectTimeout:
pass
else:
raise AssertationError("Reset {} ({}) failed!".format(dut.name, dut.port))
@IDF.idf_unit_test(env_tag="UT_T1_1") @IDF.idf_unit_test(env_tag="UT_T1_1")