diff options
| author | Tom Rini <[email protected]> | 2025-08-18 16:42:13 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-08-18 16:42:13 -0600 |
| commit | fedbb7a338286faf2fc897e136b0b9c6506fcfc4 (patch) | |
| tree | 6b25945fe3b74506f908a532c4b3a58d6f34f3ce | |
| parent | bb21c0b8d8da652d9df30d445a6b14bcb2c179ae (diff) | |
| parent | fc2686d2a87391dd1b165e44ffd525b61c93e521 (diff) | |
Merge patch series "test/py: Correctly restore the DT after capsule tests"
This series from Ilias Apalodimas <[email protected]> fixes a
number of issues with running the EFI capsule tests in CI.
Link: https://lore.kernel.org/r/[email protected]
| -rw-r--r-- | test/py/tests/test_efi_capsule/capsule_common.py | 4 | ||||
| -rw-r--r-- | test/py/tests/test_efi_capsule/conftest.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/test/py/tests/test_efi_capsule/capsule_common.py b/test/py/tests/test_efi_capsule/capsule_common.py index 04dabc176c4..8aaddfc19d6 100644 --- a/test/py/tests/test_efi_capsule/capsule_common.py +++ b/test/py/tests/test_efi_capsule/capsule_common.py @@ -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 diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py index 961d2e0b3c1..ad0cda59ebf 100644 --- a/test/py/tests/test_efi_capsule/conftest.py +++ b/test/py/tests/test_efi_capsule/conftest.py @@ -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) |