random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-20 02:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: fix pylint warnings in test_efi_bootmgr

Browse Source 
* Use f'' strings instead of .format().
* Correct sequence of imports.
* Remove a superfluous import.
* Add missing documentation.
* Replace yield by return.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt 2022-03-27 10:03:33 +02:00
parent edd8f66a0c
commit 86fa918df6
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/py/tests/test_efi_bootmgr/conftest.py
View File

@ -4,9 +4,9 @@
"""
import os
import pytest
import shutil
from subprocess import call, check_call
from subprocess import check_call
import pytest
@pytest.fixture(scope='session')
def efi_bootmgr_data(u_boot_config):
@ -14,7 +14,7 @@ def efi_bootmgr_data(u_boot_config):
tests
Args:
u_boot_config: U-boot configuration.
u_boot_config -- U-boot configuration.
Return:
A path to disk image to be used for testing
@ -34,9 +34,7 @@ def efi_bootmgr_data(u_boot_config):
shutil.copyfile(u_boot_config.build_dir + '/lib/efi_loader/initrddump.efi',
mnt_point + '/initrddump.efi')
check_call('virt-make-fs --partition=gpt --size=+1M --type=vfat {} {}'
.format(mnt_point, image_path), shell=True)
check_call(f'virt-make-fs --partition=gpt --size=+1M --type=vfat {mnt_point} {image_path}',
shell=True)
print(image_path)
yield image_path
return image_path

13
test/py/tests/test_efi_bootmgr/test_efi_bootmgr.py
View File

@ -1,4 +1,6 @@
# SPDX-License-Identifier: GPL-2.0+
""" Unit test for UEFI bootmanager
"""
import pytest
@ -6,7 +8,16 @@ import pytest
@pytest.mark.buildconfigspec('cmd_efidebug')
@pytest.mark.buildconfigspec('cmd_bootefi_bootmgr')
def test_efi_bootmgr(u_boot_console, efi_bootmgr_data):
u_boot_console.run_command(cmd = 'host bind 0 {}'.format(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:
u_boot_console -- U-Boot console
efi_bootmgr_data -- Path to the disk image used for testing.
"""
u_boot_console.run_command(cmd = f'host bind 0 {efi_bootmgr_data}')
u_boot_console.run_command(cmd = 'efidebug boot add ' \
'-b 0001 label-1 host 0:1 initrddump.efi ' \