mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-16 01:44:34 +00:00
test/py: Rework test_efi_bootmgr to not use virt-make-fs
The problem with using "virt-make-fs" to make a filesystem image is that it is extremely slow. Switch to using the fs_helper functions we have instead from the filesystem tests as these can add files to images and are significantly faster and still do not require root access. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini
parent
2c092875ab
commit
4b33810511
3 changed files with 70 additions and 82 deletions
70
test/py/tests/test_efi_bootmgr.py
Normal file
70
test/py/tests/test_efi_bootmgr.py
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
""" Unit test for UEFI bootmanager
|
||||
"""
|
||||
|
||||
import shutil
|
||||
import pytest
|
||||
from subprocess import call, check_call, CalledProcessError
|
||||
from tests import fs_helper
|
||||
|
||||
@pytest.mark.boardspec('sandbox')
|
||||
@pytest.mark.buildconfigspec('cmd_efidebug')
|
||||
@pytest.mark.buildconfigspec('cmd_bootefi_bootmgr')
|
||||
@pytest.mark.singlethread
|
||||
def test_efi_bootmgr(ubman):
|
||||
""" Unit test for UEFI bootmanager
|
||||
The efidebug command is used to set up UEFI load options.
|
||||
The bootefi bootmgr loads initrddump.efi as a payload.
|
||||
The crc32 of the loaded initrd.img is checked
|
||||
|
||||
Args:
|
||||
ubman -- U-Boot console
|
||||
"""
|
||||
try:
|
||||
efi_bootmgr_data, mnt = fs_helper.setup_image(ubman, 0, 0xc,
|
||||
basename='test_efi_bootmgr')
|
||||
|
||||
with open(mnt + '/initrd-1.img', 'w', encoding = 'ascii') as file:
|
||||
file.write("initrd 1")
|
||||
|
||||
with open(mnt + '/initrd-2.img', 'w', encoding = 'ascii') as file:
|
||||
file.write("initrd 2")
|
||||
|
||||
shutil.copyfile(ubman.config.build_dir + '/lib/efi_loader/initrddump.efi',
|
||||
mnt + '/initrddump.efi')
|
||||
|
||||
fsfile = fs_helper.mk_fs(ubman.config, 'vfat', 0x100000,
|
||||
'test_efi_bootmgr', mnt)
|
||||
check_call(f'dd if={fsfile} of={efi_bootmgr_data} bs=1M seek=1', shell=True)
|
||||
|
||||
ubman.run_command(cmd = f'host bind 0 {efi_bootmgr_data}')
|
||||
|
||||
ubman.run_command(cmd = 'efidebug boot add ' \
|
||||
'-b 0001 label-1 host 0:1 initrddump.efi ' \
|
||||
'-i host 0:1 initrd-1.img -s nocolor')
|
||||
ubman.run_command(cmd = 'efidebug boot dump')
|
||||
ubman.run_command(cmd = 'efidebug boot order 0001')
|
||||
ubman.run_command(cmd = 'bootefi bootmgr')
|
||||
response = ubman.run_command(cmd = 'load', wait_for_echo=False)
|
||||
assert 'crc32: 0x181464af' in response
|
||||
ubman.run_command(cmd = 'exit', wait_for_echo=False)
|
||||
|
||||
ubman.run_command(cmd = 'efidebug boot add ' \
|
||||
'-B 0002 label-2 host 0:1 initrddump.efi ' \
|
||||
'-I host 0:1 initrd-2.img -s nocolor')
|
||||
ubman.run_command(cmd = 'efidebug boot dump')
|
||||
ubman.run_command(cmd = 'efidebug boot order 0002')
|
||||
ubman.run_command(cmd = 'bootefi bootmgr')
|
||||
response = ubman.run_command(cmd = 'load', wait_for_echo=False)
|
||||
assert 'crc32: 0x811d3515' in response
|
||||
ubman.run_command(cmd = 'exit', wait_for_echo=False)
|
||||
|
||||
ubman.run_command(cmd = 'efidebug boot rm 0001')
|
||||
ubman.run_command(cmd = 'efidebug boot rm 0002')
|
||||
except CalledProcessError as err:
|
||||
pytest.skip('Preparing test_efi_bootmgr image failed')
|
||||
call('rm -f %s' % efi_bootmgr_data, shell=True)
|
||||
return
|
||||
finally:
|
||||
call('rm -rf %s' % mnt, shell=True)
|
||||
call('rm -f %s' % efi_bootmgr_data, shell=True)
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
|
||||
"""Fixture for UEFI bootmanager test."""
|
||||
|
||||
import os
|
||||
import shutil
|
||||
from subprocess import check_call
|
||||
import pytest
|
||||
|
||||
@pytest.fixture(scope='session')
|
||||
def efi_bootmgr_data(u_boot_config):
|
||||
"""Set up a file system to be used in UEFI bootmanager tests.
|
||||
|
||||
Args:
|
||||
u_boot_config -- U-Boot configuration.
|
||||
|
||||
Return:
|
||||
A path to disk image to be used for testing
|
||||
"""
|
||||
mnt_point = u_boot_config.persistent_data_dir + '/test_efi_bootmgr'
|
||||
image_path = u_boot_config.persistent_data_dir + '/efi_bootmgr.img'
|
||||
|
||||
shutil.rmtree(mnt_point, ignore_errors=True)
|
||||
os.mkdir(mnt_point, mode = 0o755)
|
||||
|
||||
with open(mnt_point + '/initrd-1.img', 'w', encoding = 'ascii') as file:
|
||||
file.write("initrd 1")
|
||||
|
||||
with open(mnt_point + '/initrd-2.img', 'w', encoding = 'ascii') as file:
|
||||
file.write("initrd 2")
|
||||
|
||||
shutil.copyfile(u_boot_config.build_dir + '/lib/efi_loader/initrddump.efi',
|
||||
mnt_point + '/initrddump.efi')
|
||||
|
||||
check_call(f'virt-make-fs --partition=gpt --size=+1M --type=vfat {mnt_point} {image_path}',
|
||||
shell=True)
|
||||
|
||||
return image_path
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
# SPDX-License-Identifier: GPL-2.0+
|
||||
""" Unit test for UEFI bootmanager
|
||||
"""
|
||||
|
||||
import pytest
|
||||
|
||||
@pytest.mark.boardspec('sandbox')
|
||||
@pytest.mark.buildconfigspec('cmd_efidebug')
|
||||
@pytest.mark.buildconfigspec('cmd_bootefi_bootmgr')
|
||||
@pytest.mark.singlethread
|
||||
def test_efi_bootmgr(ubman, efi_bootmgr_data):
|
||||
""" Unit test for UEFI bootmanager
|
||||
The efidebug command is used to set up UEFI load options.
|
||||
The bootefi bootmgr loads initrddump.efi as a payload.
|
||||
The crc32 of the loaded initrd.img is checked
|
||||
|
||||
Args:
|
||||
ubman -- U-Boot console
|
||||
efi_bootmgr_data -- Path to the disk image used for testing.
|
||||
"""
|
||||
ubman.run_command(cmd = f'host bind 0 {efi_bootmgr_data}')
|
||||
|
||||
ubman.run_command(cmd = 'efidebug boot add ' \
|
||||
'-b 0001 label-1 host 0:1 initrddump.efi ' \
|
||||
'-i host 0:1 initrd-1.img -s nocolor')
|
||||
ubman.run_command(cmd = 'efidebug boot dump')
|
||||
ubman.run_command(cmd = 'efidebug boot order 0001')
|
||||
ubman.run_command(cmd = 'bootefi bootmgr')
|
||||
response = ubman.run_command(cmd = 'load', wait_for_echo=False)
|
||||
assert 'crc32: 0x181464af' in response
|
||||
ubman.run_command(cmd = 'exit', wait_for_echo=False)
|
||||
|
||||
ubman.run_command(cmd = 'efidebug boot add ' \
|
||||
'-B 0002 label-2 host 0:1 initrddump.efi ' \
|
||||
'-I host 0:1 initrd-2.img -s nocolor')
|
||||
ubman.run_command(cmd = 'efidebug boot dump')
|
||||
ubman.run_command(cmd = 'efidebug boot order 0002')
|
||||
ubman.run_command(cmd = 'bootefi bootmgr')
|
||||
response = ubman.run_command(cmd = 'load', wait_for_echo=False)
|
||||
assert 'crc32: 0x811d3515' in response
|
||||
ubman.run_command(cmd = 'exit', wait_for_echo=False)
|
||||
|
||||
ubman.run_command(cmd = 'efidebug boot rm 0001')
|
||||
ubman.run_command(cmd = 'efidebug boot rm 0002')
|
||||
Loading…
Add table
Reference in a new issue