From 3048ca3222607b3056a72c5314172674fcc6f87f Mon Sep 17 00:00:00 2001 From: Harshit Malpani Date: Thu, 25 Apr 2024 12:32:08 +0530 Subject: [PATCH] feat: Enable test app for app_update component Enable all the test cases in test app of app_update component. Earlier, due to some config not enabled, not all the test cases ran. --- components/app_update/test_apps/.build-test-rules.yml | 4 ++-- components/app_update/test_apps/README.md | 4 ++-- components/app_update/test_apps/main/test_switch_ota.c | 3 +-- components/app_update/test_apps/pytest_app_update_ut.py | 1 - components/app_update/test_apps/sdkconfig.defaults | 4 ++++ components/app_update/test_apps/sdkconfig.defaults.esp32 | 4 ---- components/app_update/test_apps/sdkconfig.defaults.esp32c2 | 1 + components/app_update/test_apps/sdkconfig.defaults.esp32c3 | 1 + components/app_update/test_apps/sdkconfig.defaults.esp32c6 | 3 +++ components/app_update/test_apps/sdkconfig.defaults.esp32h2 | 3 +++ components/app_update/test_apps/sdkconfig.defaults.esp32p4 | 3 +++ components/app_update/test_apps/sdkconfig.defaults.esp32s2 | 1 + components/app_update/test_apps/sdkconfig.defaults.esp32s3 | 3 +++ 13 files changed, 24 insertions(+), 11 deletions(-) create mode 100644 components/app_update/test_apps/sdkconfig.defaults.esp32c6 create mode 100644 components/app_update/test_apps/sdkconfig.defaults.esp32h2 create mode 100644 components/app_update/test_apps/sdkconfig.defaults.esp32p4 create mode 100644 components/app_update/test_apps/sdkconfig.defaults.esp32s3 diff --git a/components/app_update/test_apps/.build-test-rules.yml b/components/app_update/test_apps/.build-test-rules.yml index 8c365fcc5e..82bea1b0fc 100644 --- a/components/app_update/test_apps/.build-test-rules.yml +++ b/components/app_update/test_apps/.build-test-rules.yml @@ -2,6 +2,6 @@ components/app_update/test_apps: disable: - - if: IDF_TARGET in ["esp32c6", "esp32h2", "esp32c5"] + - if: IDF_TARGET in ["esp32c5"] temporary: true - reason: target esp32c6, esp32h2 esp32c5 is not supported yet # TODO: [ESP32C5] IDF-8638 + reason: target esp32c5 is not supported yet # TODO: [ESP32C5] IDF-8638 diff --git a/components/app_update/test_apps/README.md b/components/app_update/test_apps/README.md index ace56d6d19..bf47d80ec6 100644 --- a/components/app_update/test_apps/README.md +++ b/components/app_update/test_apps/README.md @@ -1,2 +1,2 @@ -| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-P4 | ESP32-S2 | ESP32-S3 | -| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | +| Supported Targets | ESP32 | ESP32-C2 | ESP32-C3 | ESP32-C6 | ESP32-H2 | ESP32-P4 | ESP32-S2 | ESP32-S3 | +| ----------------- | ----- | -------- | -------- | -------- | -------- | -------- | -------- | -------- | diff --git a/components/app_update/test_apps/main/test_switch_ota.c b/components/app_update/test_apps/main/test_switch_ota.c index bbeb036c12..24c038e7e7 100644 --- a/components/app_update/test_apps/main/test_switch_ota.c +++ b/components/app_update/test_apps/main/test_switch_ota.c @@ -841,8 +841,7 @@ static void test_flow6(void) // 3 Stage: run OTA0 -> check it -> erase OTA_DATA for next tests -> PASS TEST_CASE_MULTIPLE_STAGES("Switching between factory, OTA0 using esp_ota_write_with_offset", "[app_update][timeout=90][reset=DEEPSLEEP_RESET, DEEPSLEEP_RESET]", start_test, test_flow6, test_flow6); -//IDF-5145 -TEST_CASE("Test bootloader_common_get_sha256_of_partition returns ESP_ERR_IMAGE_INVALID when image is ivalid", "[partitions]") +TEST_CASE("Test bootloader_common_get_sha256_of_partition returns ESP_ERR_IMAGE_INVALID when image is invalid", "[partitions]") { const esp_partition_t *cur_app = esp_ota_get_running_partition(); ESP_LOGI(TAG, "copy current app to next part"); diff --git a/components/app_update/test_apps/pytest_app_update_ut.py b/components/app_update/test_apps/pytest_app_update_ut.py index 594bdbf2f3..2d28f87622 100644 --- a/components/app_update/test_apps/pytest_app_update_ut.py +++ b/components/app_update/test_apps/pytest_app_update_ut.py @@ -19,7 +19,6 @@ def run_multiple_stages(dut: Dut, test_case_num: int, stages: int) -> None: @pytest.mark.supported_targets -@pytest.mark.temp_skip_ci(targets=['esp32c6', 'esp32h2'], reason='c6/h2 support TBD') @pytest.mark.generic def test_app_update(dut: Dut) -> None: extra_data = dut.parse_test_menu() diff --git a/components/app_update/test_apps/sdkconfig.defaults b/components/app_update/test_apps/sdkconfig.defaults index fb3ea86119..0532de45ca 100644 --- a/components/app_update/test_apps/sdkconfig.defaults +++ b/components/app_update/test_apps/sdkconfig.defaults @@ -14,5 +14,9 @@ CONFIG_PARTITION_TABLE_FILENAME="partition_table_unit_test_two_ota.csv" CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_OFFSET=0x18000 + +CONFIG_BOOTLOADER_FACTORY_RESET=y +CONFIG_BOOTLOADER_APP_TEST=y +CONFIG_BOOTLOADER_DATA_FACTORY_RESET="" CONFIG_BOOTLOADER_HOLD_TIME_GPIO=2 CONFIG_BOOTLOADER_OTA_DATA_ERASE=y diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32 b/components/app_update/test_apps/sdkconfig.defaults.esp32 index e515c9dc11..3f5cffb118 100644 --- a/components/app_update/test_apps/sdkconfig.defaults.esp32 +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32 @@ -1,7 +1,3 @@ CONFIG_IDF_TARGET="esp32" -CONFIG_BOOTLOADER_FACTORY_RESET=y -CONFIG_BOOTLOADER_APP_TEST=y -CONFIG_BOOTLOADER_DATA_FACTORY_RESET="" CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=32 CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=4 -CONFIG_BOOTLOADER_HOLD_TIME_GPIO=2 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c2 b/components/app_update/test_apps/sdkconfig.defaults.esp32c2 index defbe6ce10..d9b82d858c 100644 --- a/components/app_update/test_apps/sdkconfig.defaults.esp32c2 +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32c2 @@ -3,3 +3,4 @@ CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table_unit_test_two_ota_2m.csv" CONFIG_PARTITION_TABLE_FILENAME="partition_table_unit_test_two_ota_2m.csv" CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=18 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=4 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c3 b/components/app_update/test_apps/sdkconfig.defaults.esp32c3 index 30e434ceb1..9c44a5fb96 100644 --- a/components/app_update/test_apps/sdkconfig.defaults.esp32c3 +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32c3 @@ -1,2 +1,3 @@ CONFIG_IDF_TARGET="esp32c3" CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=18 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=4 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32c6 b/components/app_update/test_apps/sdkconfig.defaults.esp32c6 new file mode 100644 index 0000000000..176b721684 --- /dev/null +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32c6 @@ -0,0 +1,3 @@ +CONFIG_IDF_TARGET="esp32c6" +CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=18 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=4 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32h2 b/components/app_update/test_apps/sdkconfig.defaults.esp32h2 new file mode 100644 index 0000000000..43b2fee289 --- /dev/null +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32h2 @@ -0,0 +1,3 @@ +CONFIG_IDF_TARGET="esp32h2" +CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=22 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=4 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32p4 b/components/app_update/test_apps/sdkconfig.defaults.esp32p4 new file mode 100644 index 0000000000..0bee446626 --- /dev/null +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32p4 @@ -0,0 +1,3 @@ +CONFIG_IDF_TARGET="esp32p4" +CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=18 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=19 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32s2 b/components/app_update/test_apps/sdkconfig.defaults.esp32s2 index a485a1603b..a97c81364f 100644 --- a/components/app_update/test_apps/sdkconfig.defaults.esp32s2 +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32s2 @@ -1,2 +1,3 @@ CONFIG_IDF_TARGET="esp32s2" CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=18 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=4 diff --git a/components/app_update/test_apps/sdkconfig.defaults.esp32s3 b/components/app_update/test_apps/sdkconfig.defaults.esp32s3 new file mode 100644 index 0000000000..2a8074d567 --- /dev/null +++ b/components/app_update/test_apps/sdkconfig.defaults.esp32s3 @@ -0,0 +1,3 @@ +CONFIG_IDF_TARGET="esp32s3" +CONFIG_BOOTLOADER_NUM_PIN_APP_TEST=18 +CONFIG_BOOTLOADER_NUM_PIN_FACTORY_RESET=4