diff options
| author | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-11-26 17:10:53 -0500 |
| commit | 693650b15d04cd5a5861bd3136c9ed9e23f95c41 (patch) | |
| tree | b4a3b3ca5d9b6b6f10e3d6880f1caa17219776c2 /test/py/tests/test_efi_loader.py | |
| parent | 2ad8d0cb950da2233a2ec030533f4e54c6d04126 (diff) | |
| parent | 2b5e7108594d4e100c88f44353d1fed6456d6471 (diff) | |
Merge tag 'efi-2022-01-rc3-2' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2022-01-rc3-2
Test:
* fix pylint warnings
UEFI:
* disable interrupts before removing devices in ExitBootServices()
* implement poweroff in efi_system_reset() on sandbox
* allow booting via EFI even if some block device fails
Diffstat (limited to 'test/py/tests/test_efi_loader.py')
| -rw-r--r-- | test/py/tests/test_efi_loader.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/py/tests/test_efi_loader.py b/test/py/tests/test_efi_loader.py index fc8d6b8655..85473a9049 100644 --- a/test/py/tests/test_efi_loader.py +++ b/test/py/tests/test_efi_loader.py @@ -6,9 +6,6 @@ # Test efi loader implementation -import pytest -import u_boot_utils - """ Note: This test relies on boardenv_* containing configuration values to define which network environment is available for testing. Without this, the parts @@ -50,6 +47,9 @@ env__efi_loader_helloworld_file = { } """ +import pytest +import u_boot_utils + net_set_up = False def test_efi_pre_commands(u_boot_console): @@ -80,7 +80,7 @@ def test_efi_setup_dhcp(u_boot_console): env_vars = u_boot_console.config.env.get('env__net_static_env_vars', None) if not env_vars: pytest.skip('No DHCP server available') - return None + return u_boot_console.run_command('setenv autoload no') output = u_boot_console.run_command('dhcp') @@ -193,7 +193,7 @@ def test_efi_grub_net(u_boot_console): check_smbios = u_boot_console.config.env.get('env__efi_loader_check_smbios', False) if check_smbios: u_boot_console.wait_for('grub>') - output = u_boot_console.run_command('lsefisystab', wait_for_prompt=False, wait_for_echo=False) + u_boot_console.run_command('lsefisystab', wait_for_prompt=False, wait_for_echo=False) u_boot_console.wait_for('SMBIOS') # Then exit cleanly |