CI: erase nvs partition before test:
Latest NVS partition bin can't be parsed by old IDF revision. Need to erase before test.
This commit is contained in:
parent
8d5ec413d5
commit
bffcea09df
3 changed files with 79 additions and 22 deletions
|
@ -18,7 +18,9 @@ import sys
|
||||||
import re
|
import re
|
||||||
import subprocess
|
import subprocess
|
||||||
import functools
|
import functools
|
||||||
import serial
|
import random
|
||||||
|
import tempfile
|
||||||
|
|
||||||
from serial.tools import list_ports
|
from serial.tools import list_ports
|
||||||
|
|
||||||
import DUT
|
import DUT
|
||||||
|
@ -46,6 +48,8 @@ class IDFDUT(DUT.SerialDUT):
|
||||||
# /dev/ttyAMA0 port is listed in Raspberry Pi
|
# /dev/ttyAMA0 port is listed in Raspberry Pi
|
||||||
# /dev/tty.Bluetooth-Incoming-Port port is listed in Mac
|
# /dev/tty.Bluetooth-Incoming-Port port is listed in Mac
|
||||||
INVALID_PORT_PATTERN = re.compile(r"AMA|Bluetooth")
|
INVALID_PORT_PATTERN = re.compile(r"AMA|Bluetooth")
|
||||||
|
# if need to erase NVS partition in start app
|
||||||
|
ERASE_NVS = True
|
||||||
|
|
||||||
def __init__(self, name, port, log_file, app, **kwargs):
|
def __init__(self, name, port, log_file, app, **kwargs):
|
||||||
self.download_config, self.partition_table = app.process_app_info()
|
self.download_config, self.partition_table = app.process_app_info()
|
||||||
|
@ -74,24 +78,39 @@ class IDFDUT(DUT.SerialDUT):
|
||||||
return cls.get_chip(app, port) is not None
|
return cls.get_chip(app, port) is not None
|
||||||
|
|
||||||
@_tool_method
|
@_tool_method
|
||||||
def start_app(self):
|
def start_app(self, erase_nvs=ERASE_NVS):
|
||||||
"""
|
"""
|
||||||
download and start app.
|
download and start app.
|
||||||
|
|
||||||
|
:param: erase_nvs: whether erase NVS partition during flash
|
||||||
:return: None
|
:return: None
|
||||||
"""
|
"""
|
||||||
|
if erase_nvs:
|
||||||
|
address = self.partition_table["nvs"]["offset"]
|
||||||
|
size = self.partition_table["nvs"]["size"]
|
||||||
|
nvs_file = tempfile.NamedTemporaryFile()
|
||||||
|
nvs_file.write(chr(0xFF) * size)
|
||||||
|
nvs_file.flush()
|
||||||
|
download_config = self.download_config + [address, nvs_file.name]
|
||||||
|
else:
|
||||||
|
download_config = self.download_config
|
||||||
|
|
||||||
retry_baud_rates = ["921600", "115200"]
|
retry_baud_rates = ["921600", "115200"]
|
||||||
error = IDFToolError()
|
error = IDFToolError()
|
||||||
|
try:
|
||||||
for baud_rate in retry_baud_rates:
|
for baud_rate in retry_baud_rates:
|
||||||
try:
|
try:
|
||||||
subprocess.check_output(["python", self.app.esptool,
|
subprocess.check_output(["python", self.app.esptool,
|
||||||
"--port", self.port, "--baud", baud_rate]
|
"--port", self.port, "--baud", baud_rate]
|
||||||
+ self.download_config)
|
+ download_config)
|
||||||
break
|
break
|
||||||
except subprocess.CalledProcessError as error:
|
except subprocess.CalledProcessError as error:
|
||||||
continue
|
continue
|
||||||
else:
|
else:
|
||||||
raise error
|
raise error
|
||||||
|
finally:
|
||||||
|
if erase_nvs:
|
||||||
|
nvs_file.close()
|
||||||
|
|
||||||
@_tool_method
|
@_tool_method
|
||||||
def reset(self):
|
def reset(self):
|
||||||
|
@ -102,6 +121,17 @@ class IDFDUT(DUT.SerialDUT):
|
||||||
"""
|
"""
|
||||||
subprocess.check_output(["python", self.app.esptool, "--port", self.port, "run"])
|
subprocess.check_output(["python", self.app.esptool, "--port", self.port, "run"])
|
||||||
|
|
||||||
|
@_tool_method
|
||||||
|
def erase_partition(self, partition):
|
||||||
|
"""
|
||||||
|
:param partition: partition name to erase
|
||||||
|
:return: None
|
||||||
|
"""
|
||||||
|
address = self.partition_table[partition]["offset"]
|
||||||
|
size = self.partition_table[partition]["size"]
|
||||||
|
with open(".erase_partition.tmp", "wb") as f:
|
||||||
|
f.write(chr(0xFF) * size)
|
||||||
|
|
||||||
@_tool_method
|
@_tool_method
|
||||||
def dump_flush(self, output_file, **kwargs):
|
def dump_flush(self, output_file, **kwargs):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -20,9 +20,8 @@ from IDF.IDFApp import IDFApp, Example, UT
|
||||||
from IDF.IDFDUT import IDFDUT
|
from IDF.IDFDUT import IDFDUT
|
||||||
|
|
||||||
|
|
||||||
def idf_example_test(app=Example, dut=IDFDUT, chip="ESP32",
|
def idf_example_test(app=Example, dut=IDFDUT, chip="ESP32", module="examples", execution_time=1,
|
||||||
module="examples", execution_time=1, level="example",
|
level="example", erase_nvs=True, **kwargs):
|
||||||
**kwargs):
|
|
||||||
"""
|
"""
|
||||||
decorator for testing idf examples (with default values for some keyword args).
|
decorator for testing idf examples (with default values for some keyword args).
|
||||||
|
|
||||||
|
@ -32,10 +31,41 @@ def idf_example_test(app=Example, dut=IDFDUT, chip="ESP32",
|
||||||
:param module: module, string
|
:param module: module, string
|
||||||
:param execution_time: execution time in minutes, int
|
:param execution_time: execution time in minutes, int
|
||||||
:param level: test level, could be used to filter test cases, string
|
:param level: test level, could be used to filter test cases, string
|
||||||
|
:param erase_nvs: if need to erase_nvs in DUT.start_app()
|
||||||
:param kwargs: other keyword args
|
:param kwargs: other keyword args
|
||||||
:return: test method
|
:return: test method
|
||||||
"""
|
"""
|
||||||
# not use partial function as define as function support auto generating document
|
try:
|
||||||
|
# try to config the default behavior of erase nvs
|
||||||
|
dut.ERASE_NVS = erase_nvs
|
||||||
|
except AttributeError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
return TinyFW.test_method(app=app, dut=dut, chip=chip, module=module,
|
||||||
|
execution_time=execution_time, level=level, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
|
def idf_unit_test(app=UT, dut=IDFDUT, chip="ESP32", module="unit-test", execution_time=1,
|
||||||
|
level="unit", erase_nvs=True, **kwargs):
|
||||||
|
"""
|
||||||
|
decorator for testing idf unit tests (with default values for some keyword args).
|
||||||
|
|
||||||
|
:param app: test application class
|
||||||
|
:param dut: dut class
|
||||||
|
:param chip: chip supported, string or tuple
|
||||||
|
:param module: module, string
|
||||||
|
:param execution_time: execution time in minutes, int
|
||||||
|
:param level: test level, could be used to filter test cases, string
|
||||||
|
:param erase_nvs: if need to erase_nvs in DUT.start_app()
|
||||||
|
:param kwargs: other keyword args
|
||||||
|
:return: test method
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
# try to config the default behavior of erase nvs
|
||||||
|
dut.ERASE_NVS = erase_nvs
|
||||||
|
except AttributeError:
|
||||||
|
pass
|
||||||
|
|
||||||
return TinyFW.test_method(app=app, dut=dut, chip=chip, module=module,
|
return TinyFW.test_method(app=app, dut=dut, chip=chip, module=module,
|
||||||
execution_time=execution_time, level=level, **kwargs)
|
execution_time=execution_time, level=level, **kwargs)
|
||||||
|
|
||||||
|
|
|
@ -105,8 +105,7 @@ def format_test_case_config(test_case_data):
|
||||||
return case_config
|
return case_config
|
||||||
|
|
||||||
|
|
||||||
@TinyFW.test_method(app=UT, dut=IDF.IDFDUT, chip="ESP32", module="unit_test",
|
@IDF.idf_unit_test(env_tag="UT_T1_1")
|
||||||
execution_time=1, env_tag="UT_T1_1")
|
|
||||||
def run_unit_test_cases(env, extra_data):
|
def run_unit_test_cases(env, extra_data):
|
||||||
"""
|
"""
|
||||||
extra_data can be three types of value
|
extra_data can be three types of value
|
||||||
|
@ -347,8 +346,7 @@ def case_run(duts, ut_config, env, one_case, failed_cases):
|
||||||
Utility.console_log("Failed: " + one_case["name"], color="red")
|
Utility.console_log("Failed: " + one_case["name"], color="red")
|
||||||
|
|
||||||
|
|
||||||
@TinyFW.test_method(app=UT, dut=IDF.IDFDUT, chip="ESP32", module="master_slave_test_case", execution_time=1,
|
@IDF.idf_unit_test(env_tag="UT_T2_1")
|
||||||
env_tag="UT_T2_1")
|
|
||||||
def run_multiple_devices_cases(env, extra_data):
|
def run_multiple_devices_cases(env, extra_data):
|
||||||
"""
|
"""
|
||||||
extra_data can be two types of value
|
extra_data can be two types of value
|
||||||
|
@ -385,8 +383,7 @@ def run_multiple_devices_cases(env, extra_data):
|
||||||
raise AssertionError("Unit Test Failed")
|
raise AssertionError("Unit Test Failed")
|
||||||
|
|
||||||
|
|
||||||
@TinyFW.test_method(app=UT, dut=IDF.IDFDUT, chip="ESP32", module="unit_test",
|
@IDF.idf_unit_test(env_tag="UT_T1_1")
|
||||||
execution_time=1, env_tag="UT_T1_1")
|
|
||||||
def run_multiple_stage_cases(env, extra_data):
|
def run_multiple_stage_cases(env, extra_data):
|
||||||
"""
|
"""
|
||||||
extra_data can be 2 types of value
|
extra_data can be 2 types of value
|
||||||
|
|
Loading…
Reference in a new issue