From b53174212ddd6bc22f09f58353db2a73d6eb7242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20M=C3=BAdry?= Date: Thu, 8 Jan 2026 15:19:35 +0100 Subject: [PATCH] fix(examples): Fixed wrong timeout placement in examples/sd_card/* pytest --- .../storage/sd_card/sdmmc/pytest_sdmmc_card_example.py | 5 +++-- .../storage/sd_card/sdspi/pytest_sdspi_card_example.py | 9 +++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/examples/storage/sd_card/sdmmc/pytest_sdmmc_card_example.py b/examples/storage/sd_card/sdmmc/pytest_sdmmc_card_example.py index 03bfcdbe785..97e058eeb46 100644 --- a/examples/storage/sd_card/sdmmc/pytest_sdmmc_card_example.py +++ b/examples/storage/sd_card/sdmmc/pytest_sdmmc_card_example.py @@ -33,8 +33,8 @@ def test_examples_sd_card_sdmmc(dut: Dut) -> None: f"Read from file: 'Hello {name}!'", ) sd_card_format = re.compile(str.encode('formatting drive, allocation unit size=\\S+')) + after_card_format = "file doesn't exist, formatting done" message_list2 = ( - "file doesn't exist, formatting done", 'Opening file /sdcard/nihao.txt', 'File written', 'Reading file /sdcard/nihao.txt', @@ -44,6 +44,7 @@ def test_examples_sd_card_sdmmc(dut: Dut) -> None: for msg in message_list1: dut.expect_exact(msg, timeout=30) - dut.expect(sd_card_format, timeout=180) # Provide enough time for SD card FATFS format operation + dut.expect(sd_card_format, timeout=10) + dut.expect_exact(after_card_format, timeout=180) # Provide enough time for SD card FATFS format operation for msg in message_list2: dut.expect_exact(msg, timeout=30) diff --git a/examples/storage/sd_card/sdspi/pytest_sdspi_card_example.py b/examples/storage/sd_card/sdspi/pytest_sdspi_card_example.py index 8a0c222fcac..3a3f054cf51 100644 --- a/examples/storage/sd_card/sdspi/pytest_sdspi_card_example.py +++ b/examples/storage/sd_card/sdspi/pytest_sdspi_card_example.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2022-2025 Espressif Systems (Shanghai) CO LTD +# SPDX-FileCopyrightText: 2022-2026 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: Unlicense OR CC0-1.0 import logging import re @@ -34,8 +34,8 @@ def test_examples_sd_card_sdspi(dut: Dut) -> None: f"Read from file: 'Hello {name}!'", ) sd_card_format = re.compile(str.encode('formatting drive, allocation unit size=\\S+')) + after_card_format = "file doesn't exist, formatting done" message_list2 = ( - "file doesn't exist, formatting done", 'Opening file /sdcard/nihao.txt', 'File written', 'Reading file /sdcard/nihao.txt', @@ -45,6 +45,7 @@ def test_examples_sd_card_sdspi(dut: Dut) -> None: for msg in message_list1: dut.expect_exact(msg, timeout=30) - dut.expect(sd_card_format, timeout=180) # Provide enough time for SD card FATFS format operation + dut.expect(sd_card_format, timeout=10) + dut.expect_exact(after_card_format, timeout=180) # Provide enough time for SD card FATFS format operation for msg in message_list2: - dut.expect_exact(msg, timeout=180) + dut.expect_exact(msg, timeout=30)