espressif/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-04-27 19:13:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/example_sd_card_pytest_wrong_timeout' into 'master'

Browse Source 
fix(examples): Fixed wrong timeout placement in examples/sd_card/* pytest

Closes IDFCI-7325

See merge request espressif/esp-idf!44944
This commit is contained in:
Adam Múdry
2026-01-12 04:31:53 +01:00
parent 4a2c47e4d4 fdaeef206c
commit b831cccdd3
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/storage/sd_card/sdmmc/pytest_sdmmc_card_example.py
+3 -2
View File
@@ -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)
examples/storage/sd_card/sdspi/pytest_sdspi_card_example.py
+5 -4
View File
@@ -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)