diff --git a/components/esp_tee/test_apps/tee_cli_app/pytest_tee_cli.py b/components/esp_tee/test_apps/tee_cli_app/pytest_tee_cli.py index 440ed5ec1ef..fb9d15e9125 100644 --- a/components/esp_tee/test_apps/tee_cli_app/pytest_tee_cli.py +++ b/components/esp_tee/test_apps/tee_cli_app/pytest_tee_cli.py @@ -21,7 +21,7 @@ from ecdsa.util import sigdecode_der from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize -SUPPORTED_TARGETS = ['esp32c6', 'esp32c5', 'esp32c61'] +TESTING_TARGETS = ['esp32c6', 'esp32c5', 'esp32c61'] TEST_MSG = 'hello world' @@ -35,7 +35,7 @@ key_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_certs/ @pytest.mark.generic -@idf_parametrize('target', SUPPORTED_TARGETS, indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_tee_cli_secure_storage(dut: Dut) -> None: # Dumping the REE binary size binary_file = os.path.join(dut.app.binary_path, 'tee_cli.bin') @@ -121,7 +121,7 @@ def verify_att_token_signature(att_tk: str) -> Any: @pytest.mark.generic -@idf_parametrize('target', SUPPORTED_TARGETS, indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_tee_cli_attestation(dut: Dut) -> None: # Dumping the REE binary size binary_file = os.path.join(dut.app.binary_path, 'tee_cli.bin') @@ -163,7 +163,7 @@ def start_https_server(ota_image_dir: str, server_ip: str, server_port: int) -> @pytest.mark.wifi_high_traffic -@idf_parametrize('target', SUPPORTED_TARGETS, indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_tee_cli_secure_ota_wifi(dut: Dut) -> None: """ This is a positive test case, which downloads complete binary file multiple number of times. diff --git a/components/esp_tee/test_apps/tee_test_fw/pytest_esp_tee_ut.py b/components/esp_tee/test_apps/tee_test_fw/pytest_esp_tee_ut.py index d0a8432f13a..927a635dcb9 100644 --- a/components/esp_tee/test_apps/tee_test_fw/pytest_esp_tee_ut.py +++ b/components/esp_tee/test_apps/tee_test_fw/pytest_esp_tee_ut.py @@ -9,25 +9,25 @@ from pytest_embedded_idf.utils import idf_parametrize # ---------------- Pytest build parameters ---------------- -SUPPORTED_TARGETS = ['esp32c6', 'esp32h2', 'esp32c5', 'esp32c61'] +TESTING_TARGETS = ['esp32c6', 'esp32h2', 'esp32c5', 'esp32c61'] CONFIG_DEFAULT = [ # 'config, target, markers', ('tee_default', target, (pytest.mark.generic,)) - for target in SUPPORTED_TARGETS + for target in TESTING_TARGETS ] CONFIG_OTA = [ # 'config, target, skip_autoflash, markers', ('tee_ota', target, 'y', (pytest.mark.generic,)) - for target in SUPPORTED_TARGETS + for target in TESTING_TARGETS ] CONFIG_ALL = [ # 'config, target, markers', (config, target, (pytest.mark.generic,)) for config in ['tee_default', 'tee_ota'] - for target in SUPPORTED_TARGETS + for target in TESTING_TARGETS ] # ---------------- Exception test-cases reasons ---------------- @@ -359,7 +359,7 @@ def test_esp_tee_flash_prot_esp_flash(dut: IdfDut) -> None: @pytest.mark.generic @idf_parametrize('config', ['tee_ota'], indirect=['config']) -@idf_parametrize('target', SUPPORTED_TARGETS, indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_esp_tee_ota_negative(dut: IdfDut) -> None: # start test dut.run_all_single_board_cases(group='ota_neg_1', timeout=30) diff --git a/examples/security/tee/tee_attestation/pytest_tee_attestation.py b/examples/security/tee/tee_attestation/pytest_tee_attestation.py index 3859da752f5..fff2db826d1 100644 --- a/examples/security/tee/tee_attestation/pytest_tee_attestation.py +++ b/examples/security/tee/tee_attestation/pytest_tee_attestation.py @@ -13,6 +13,8 @@ from ecdsa.util import sigdecode_der from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize +TESTING_TARGETS = ['esp32c6', 'esp32h2', 'esp32c5', 'esp32c61'] + def verify_att_token_signature(att_tk: str) -> Any: # Parsing the token @@ -46,7 +48,7 @@ def verify_att_token_signature(att_tk: str) -> Any: @pytest.mark.generic -@idf_parametrize('target', ['esp32c6', 'esp32c5', 'esp32c61'], indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_example_tee_attestation(dut: Dut) -> None: # Erase the TEE secure_storage partition dut.serial.erase_partition('secure_storage') diff --git a/examples/security/tee/tee_basic/pytest_tee_basic.py b/examples/security/tee/tee_basic/pytest_tee_basic.py index 4ec63b46cf9..2cea20f4a4f 100644 --- a/examples/security/tee/tee_basic/pytest_tee_basic.py +++ b/examples/security/tee/tee_basic/pytest_tee_basic.py @@ -7,9 +7,11 @@ import pytest from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize +TESTING_TARGETS = ['esp32c6', 'esp32h2', 'esp32c5', 'esp32c61'] + @pytest.mark.generic -@idf_parametrize('target', ['esp32c6', 'esp32c5', 'esp32c61'], indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_example_tee_basic(dut: Dut) -> None: # Logging example binary details binary_files = [ diff --git a/examples/security/tee/tee_secure_ota/pytest_tee_secure_ota.py b/examples/security/tee/tee_secure_ota/pytest_tee_secure_ota.py index 2978a7b8ebd..5cba2366610 100644 --- a/examples/security/tee/tee_secure_ota/pytest_tee_secure_ota.py +++ b/examples/security/tee/tee_secure_ota/pytest_tee_secure_ota.py @@ -13,6 +13,8 @@ from common_test_methods import get_host_ip4_by_dest_ip from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize +TESTING_TARGETS = ['esp32c6', 'esp32c5', 'esp32c61'] + server_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_certs/server_cert.pem') key_file = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'test_certs/server_key.pem') @@ -32,7 +34,7 @@ def start_https_server(ota_image_dir: str, server_ip: str, server_port: int) -> @pytest.mark.wifi_high_traffic -@idf_parametrize('target', ['esp32c5', 'esp32c6', 'esp32c61'], indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_examples_tee_secure_ota_example(dut: Dut) -> None: """ This is a positive test case, which downloads complete binary file multiple number of times. diff --git a/examples/security/tee/tee_secure_storage/pytest_tee_secure_storage.py b/examples/security/tee/tee_secure_storage/pytest_tee_secure_storage.py index bfecb85a758..07d30015f33 100644 --- a/examples/security/tee/tee_secure_storage/pytest_tee_secure_storage.py +++ b/examples/security/tee/tee_secure_storage/pytest_tee_secure_storage.py @@ -4,9 +4,11 @@ import pytest from pytest_embedded import Dut from pytest_embedded_idf.utils import idf_parametrize +TESTING_TARGETS = ['esp32c6', 'esp32h2', 'esp32c5', 'esp32c61'] + @pytest.mark.generic -@idf_parametrize('target', ['esp32c6', 'esp32c5', 'esp32c61'], indirect=['target']) +@idf_parametrize('target', TESTING_TARGETS, indirect=['target']) def test_example_tee_secure_storage(dut: Dut) -> None: # Start test dut.expect('TEE Secure Storage', timeout=30)