From 4afb86fce38266e00e7a16f5708f3050c0b5244b Mon Sep 17 00:00:00 2001 From: Fu Hanxi Date: Tue, 16 Jan 2024 11:31:59 +0100 Subject: [PATCH] test: fix custom additional app for multicore test cases --- .../pytest_unicore_bootloader.py | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/tools/test_apps/system/unicore_bootloader/pytest_unicore_bootloader.py b/tools/test_apps/system/unicore_bootloader/pytest_unicore_bootloader.py index 2e5fdc4d11..f0193dbe04 100644 --- a/tools/test_apps/system/unicore_bootloader/pytest_unicore_bootloader.py +++ b/tools/test_apps/system/unicore_bootloader/pytest_unicore_bootloader.py @@ -1,9 +1,10 @@ -# SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 - import os import pytest +from artifacts_handler import ArtifactType +from idf_ci_utils import IDF_PATH from pytest_embedded import Dut @@ -12,12 +13,17 @@ from pytest_embedded import Dut @pytest.mark.esp32p4 @pytest.mark.generic @pytest.mark.parametrize('config', ['multicore'], indirect=True) -def test_multicore_app_and_unicore_bootloader(dut: Dut) -> None: +def test_multicore_app_and_unicore_bootloader(dut: Dut, app_downloader) -> None: # type: ignore dut.expect('Multicore bootloader') dut.expect('Multicore app') dut.expect('App is running') path_to_unicore_build = os.path.join(dut.app.app_path, f'build_{dut.target}_unicore') + if app_downloader: + app_downloader.download_app( + os.path.relpath(path_to_unicore_build, IDF_PATH), ArtifactType.BUILD_DIR_WITHOUT_MAP_AND_ELF_FILES + ) + dut.serial.bootloader_flash(path_to_unicore_build) dut.expect('Unicore bootloader') dut.expect('Multicore app') @@ -29,13 +35,18 @@ def test_multicore_app_and_unicore_bootloader(dut: Dut) -> None: @pytest.mark.esp32p4 @pytest.mark.generic @pytest.mark.parametrize('config', ['unicore'], indirect=True) -def test_unicore_app_and_multicore_bootloader(dut: Dut) -> None: +def test_unicore_app_and_multicore_bootloader(dut: Dut, app_downloader) -> None: # type: ignore dut.expect('Unicore bootloader') dut.expect('Unicore app') dut.expect('App is running') - path_to_unicore_build = os.path.join(dut.app.app_path, f'build_{dut.target}_multicore') - dut.serial.bootloader_flash(path_to_unicore_build) + path_to_multicore_build = os.path.join(dut.app.app_path, f'build_{dut.target}_multicore') + if app_downloader: + app_downloader.download_app( + os.path.relpath(path_to_multicore_build, IDF_PATH), ArtifactType.BUILD_DIR_WITHOUT_MAP_AND_ELF_FILES + ) + + dut.serial.bootloader_flash(path_to_multicore_build) dut.expect('Multicore bootloader') dut.expect('Unicore app') dut.expect('App is running')