Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge patch series "test/py: Correctly restore the DT after capsule tests"

Browse Source 
This series from Ilias Apalodimas <ilias.apalodimas@linaro.org> fixes a
number of issues with running the EFI capsule tests in CI.

Link: https://lore.kernel.org/r/20250807080819.1058411-1-ilias.apalodimas@linaro.org
This commit is contained in:
Tom Rini
2025-08-18 16:42:13 -06:00
parent bb21c0b8d8 fc2686d2a8
commit fedbb7a338
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/py/tests/test_efi_capsule/capsule_common.py
View File

@@ -42,7 +42,7 @@ def init_content(ubman, target, filename, expected):
'sf probe 0:0',
f'fatload host 0:1 4000000 {CAPSULE_DATA_DIR}/{filename}',
f'sf write 4000000 {target} 10',
'sf read 5000000 100000 10',
f'sf read 5000000 {target} 10',
'md.b 5000000 10'])
assert expected in ''.join(output)
@@ -137,6 +137,8 @@ def do_reboot_dtb_specified(u_boot_config, ubman, dtb_filename):
dtb_filename -- DTB file name.
"""
mnt_point = u_boot_config.persistent_data_dir + '/scratch'
old_dtb = ubman.config.dtb
ubman.config.dtb = mnt_point + CAPSULE_DATA_DIR \
+ f'/{dtb_filename}'
ubman.restart_uboot()
ubman.config.dtb = old_dtb

3
test/py/tests/test_efi_capsule/conftest.py
View File

@@ -44,8 +44,6 @@ def efi_capsule_data(request, ubman):
% (key_dir, data_dir), shell=True)
check_call('cp %s/capsule_pub_key_good.crt %s/SIGNER.crt'
% (key_dir, data_dir), shell=True)
check_call('cp %s/capsule_pub_esl_good.esl %s/SIGNER.esl'
% (key_dir, data_dir), shell=True)
check_call('cp %s/capsule_priv_key_bad.key %s/SIGNER2.key'
% (key_dir, data_dir), shell=True)
@@ -103,6 +101,7 @@ def efi_capsule_data(request, ubman):
pytest.skip('Setup failed: %s' % exception.cmd)
return
else:
ubman.restart_uboot()
yield image_path
finally:
call('rm -rf %s' % mnt_point, shell=True)