alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'fix/sdcard_example_blocker' into 'master'

Browse Source 
CI: fix sdcard examples timeout

Closes IDFCI-1696, IDFCI-1683, IDFCI-1684, and IDFCI-1687

See merge request espressif/esp-idf!23410
This commit is contained in:
Martin Vychodil 2023-04-26 16:33:53 +08:00
commit 53f680d0c1
4 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/storage/sd_card/sdmmc/pytest_sdmmc_card_example.py
View File

@ -26,18 +26,21 @@ def test_examples_sd_card_sdmmc(dut: Dut) -> None:
logging.info('Card {} {} {}MHz {} found'.format(name, _type, speed, size)) logging.info('Card {} {} {}MHz {} found'.format(name, _type, speed, size))
message_list = ('Opening file /sdcard/hello.txt', message_list1 = ('Opening file /sdcard/hello.txt',
'File written', 'File written',
'Renaming file /sdcard/hello.txt to /sdcard/foo.txt', 'Renaming file /sdcard/hello.txt to /sdcard/foo.txt',
'Reading file /sdcard/foo.txt', 'Reading file /sdcard/foo.txt',
"Read from file: 'Hello {}!'".format(name), "Read from file: 'Hello {}!'".format(name))
re.compile(str.encode('Formatting card, allocation unit size=\\S+')), sd_card_format = re.compile(str.encode('Formatting card, allocation unit size=\\S+'))
'file doesnt exist, format done', message_list2 = ('file doesnt exist, format done',
'Opening file /sdcard/nihao.txt', 'Opening file /sdcard/nihao.txt',
'File written', 'File written',
'Reading file /sdcard/nihao.txt', 'Reading file /sdcard/nihao.txt',
"Read from file: 'Nihao {}!'".format(name), "Read from file: 'Nihao {}!'".format(name),
'Card unmounted') 'Card unmounted')
for msg in message_list: for msg in message_list1:
dut.expect(msg, timeout=60) dut.expect_exact(msg, timeout=30)
dut.expect(sd_card_format, timeout=180) # Provide enough time for SD card FATFS format operation
for msg in message_list2:
dut.expect_exact(msg, timeout=30)

1
examples/storage/sd_card/sdmmc/sdkconfig.ci
View File

@ -1,2 +1,3 @@
CONFIG_EXAMPLE_FORMAT_IF_MOUNT_FAILED=y CONFIG_EXAMPLE_FORMAT_IF_MOUNT_FAILED=y
CONFIG_FATFS_VFS_FSTAT_BLKSIZE=4096 CONFIG_FATFS_VFS_FSTAT_BLKSIZE=4096
CONFIG_ESP_TASK_WDT_EN=n

15
examples/storage/sd_card/sdspi/pytest_sdspi_card_example.py
View File

@ -28,18 +28,21 @@ def test_examples_sd_card_sdspi(dut: Dut) -> None:
logging.info('Card {} {} {}MHz {} found'.format(name, _type, speed, size)) logging.info('Card {} {} {}MHz {} found'.format(name, _type, speed, size))
message_list = ('Opening file /sdcard/hello.txt', message_list1 = ('Opening file /sdcard/hello.txt',
'File written', 'File written',
'Renaming file /sdcard/hello.txt to /sdcard/foo.txt', 'Renaming file /sdcard/hello.txt to /sdcard/foo.txt',
'Reading file /sdcard/foo.txt', 'Reading file /sdcard/foo.txt',
"Read from file: 'Hello {}!'".format(name), "Read from file: 'Hello {}!'".format(name))
re.compile(str.encode('Formatting card, allocation unit size=\\S+')), sd_card_format = re.compile(str.encode('Formatting card, allocation unit size=\\S+'))
'file doesnt exist, format done', message_list2 = ('file doesnt exist, format done',
'Opening file /sdcard/nihao.txt', 'Opening file /sdcard/nihao.txt',
'File written', 'File written',
'Reading file /sdcard/nihao.txt', 'Reading file /sdcard/nihao.txt',
"Read from file: 'Nihao {}!'".format(name), "Read from file: 'Nihao {}!'".format(name),
'Card unmounted') 'Card unmounted')
for msg in message_list: for msg in message_list1:
dut.expect(msg, timeout=20) dut.expect_exact(msg, timeout=30)
dut.expect(sd_card_format, timeout=180) # Provide enough time for SD card FATFS format operation
for msg in message_list2:
dut.expect_exact(msg, timeout=30)

2
examples/storage/sd_card/sdspi/sdkconfig.ci
View File

@ -1 +1,3 @@
CONFIG_EXAMPLE_FORMAT_IF_MOUNT_FAILED=y CONFIG_EXAMPLE_FORMAT_IF_MOUNT_FAILED=y
CONFIG_FATFS_VFS_FSTAT_BLKSIZE=4096
CONFIG_ESP_TASK_WDT_EN=n