dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: fix pylint warning for capsule tests

Browse Source 
Fix pylint warnings like:

* Class inherits from object
* Missing module description
* Missing class description
* First line of comment blank
* Superfluous imports

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Heinrich Schuchardt
2023-04-13 18:13:32 +02:00
parent 4bccbd32fb
commit b54477ff8b
4 changed files with 65 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,30 +2,21 @@
# Copyright (c) 2020, Linaro Limited # Copyright (c) 2020, Linaro Limited
# Author: AKASHI Takahiro <takahiro.akashi@linaro.org> # Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
import os """Fixture for UEFI capsule test
import os.path """
import re
from subprocess import call, check_call, check_output, CalledProcessError
import pytest
from capsule_defs import *
# from subprocess import call, check_call, CalledProcessError
# Fixture for UEFI capsule test import pytest
# from capsule_defs import CAPSULE_DATA_DIR, CAPSULE_INSTALL_DIR, EFITOOLS_PATH
@pytest.fixture(scope='session') @pytest.fixture(scope='session')
def efi_capsule_data(request, u_boot_config): def efi_capsule_data(request, u_boot_config):
"""Set up a file system to be used in UEFI capsule and """Set up a file system to be used in UEFI capsule and authentication test
authentication test. and return a ath to disk image to be used for testing
Args: request -- Pytest request object.
request: Pytest request object. u_boot_config -- U-boot configuration.
u_boot_config: U-boot configuration.
Return:
A path to disk image to be used for testing
""" """
global CAPSULE_DATA_DIR, CAPSULE_INSTALL_DIR
mnt_point = u_boot_config.persistent_data_dir + '/test_efi_capsule' mnt_point = u_boot_config.persistent_data_dir + '/test_efi_capsule'
data_dir = mnt_point + CAPSULE_DATA_DIR data_dir = mnt_point + CAPSULE_DATA_DIR

35
test/py/tests/test_efi_capsule/test_capsule_firmware_fit.py
View File

@@ -1,16 +1,13 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2020, Linaro Limited # Copyright (c) 2020, Linaro Limited
# Author: AKASHI Takahiro <takahiro.akashi@linaro.org> # Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
#
# U-Boot UEFI: Firmware Update Test
""" """U-Boot UEFI: Firmware Update Test
This test verifies capsule-on-disk firmware update for FIT images This test verifies capsule-on-disk firmware update for FIT images
""" """
from subprocess import check_call, check_output, CalledProcessError
import pytest import pytest
from capsule_defs import * from capsule_defs import CAPSULE_DATA_DIR, CAPSULE_INSTALL_DIR
@pytest.mark.boardspec('sandbox_flattree') @pytest.mark.boardspec('sandbox_flattree')
@@ -24,15 +21,18 @@ from capsule_defs import *
@pytest.mark.buildconfigspec('cmd_nvedit_efi') @pytest.mark.buildconfigspec('cmd_nvedit_efi')
@pytest.mark.buildconfigspec('cmd_sf') @pytest.mark.buildconfigspec('cmd_sf')
@pytest.mark.slow @pytest.mark.slow
class TestEfiCapsuleFirmwareFit(object): class TestEfiCapsuleFirmwareFit():
"""Test capsule-on-disk firmware update for FIT images
"""
def test_efi_capsule_fw1( def test_efi_capsule_fw1(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
""" """Test Case 1
Test Case 1 - Update U-Boot and U-Boot environment on SPI Flash Update U-Boot and U-Boot environment on SPI Flash
but with an incorrect GUID value in the capsule but with an incorrect GUID value in the capsule
No update should happen No update should happen
0x100000-0x150000: U-Boot binary (but dummy) 0x100000-0x150000: U-Boot binary (but dummy)
0x150000-0x200000: U-Boot environment (but dummy) 0x150000-0x200000: U-Boot environment (but dummy)
""" """
# other tests might have run and the # other tests might have run and the
# system might not be in a clean state. # system might not be in a clean state.
@@ -74,8 +74,6 @@ class TestEfiCapsuleFirmwareFit(object):
capsule_early = u_boot_config.buildconfig.get( capsule_early = u_boot_config.buildconfig.get(
'config_efi_capsule_on_disk_early') 'config_efi_capsule_on_disk_early')
capsule_auth = u_boot_config.buildconfig.get(
'config_efi_capsule_authenticate')
# reboot # reboot
u_boot_console.restart_uboot(expect_reset = capsule_early) u_boot_console.restart_uboot(expect_reset = capsule_early)
@@ -107,11 +105,12 @@ class TestEfiCapsuleFirmwareFit(object):
def test_efi_capsule_fw2( def test_efi_capsule_fw2(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
"""Test Case 2
Update U-Boot and U-Boot environment on SPI Flash
0x100000-0x150000: U-Boot binary (but dummy)
0x150000-0x200000: U-Boot environment (but dummy)
""" """
Test Case 2 - Update U-Boot and U-Boot environment on SPI Flash
0x100000-0x150000: U-Boot binary (but dummy)
0x150000-0x200000: U-Boot environment (but dummy)
"""
disk_img = efi_capsule_data disk_img = efi_capsule_data
with u_boot_console.log.section('Test Case 2-a, before reboot'): with u_boot_console.log.section('Test Case 2-a, before reboot'):
output = u_boot_console.run_command_list([ output = u_boot_console.run_command_list([

41
test/py/tests/test_efi_capsule/test_capsule_firmware_signed_fit.py
View File

@@ -3,10 +3,8 @@
# Copyright (c) 2022, Arm Limited # Copyright (c) 2022, Arm Limited
# Author: AKASHI Takahiro <takahiro.akashi@linaro.org>, # Author: AKASHI Takahiro <takahiro.akashi@linaro.org>,
# adapted to FIT images by Vincent Stehlé <vincent.stehle@arm.com> # adapted to FIT images by Vincent Stehlé <vincent.stehle@arm.com>
#
# U-Boot UEFI: Firmware Update (Signed capsule with FIT images) Test
""" """U-Boot UEFI: Firmware Update (Signed capsule with FIT images) Test
This test verifies capsule-on-disk firmware update This test verifies capsule-on-disk firmware update
with signed capsule files containing FIT images with signed capsule files containing FIT images
""" """
@@ -25,15 +23,18 @@ from capsule_defs import CAPSULE_DATA_DIR, CAPSULE_INSTALL_DIR
@pytest.mark.buildconfigspec('cmd_nvedit_efi') @pytest.mark.buildconfigspec('cmd_nvedit_efi')
@pytest.mark.buildconfigspec('cmd_sf') @pytest.mark.buildconfigspec('cmd_sf')
@pytest.mark.slow @pytest.mark.slow
class TestEfiCapsuleFirmwareSignedFit(object): class TestEfiCapsuleFirmwareSignedFit():
"""Capsule-on-disk firmware update test
"""
def test_efi_capsule_auth1( def test_efi_capsule_auth1(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
""" """Test Case 1
Test Case 1 - Update U-Boot on SPI Flash, FIT image format Update U-Boot on SPI Flash, FIT image format
0x100000-0x150000: U-Boot binary (but dummy) x150000: U-Boot binary (but dummy)
If the capsule is properly signed, the authentication If the capsule is properly signed, the authentication
should pass and the firmware be updated. should pass and the firmware be updated.
""" """
disk_img = efi_capsule_data disk_img = efi_capsule_data
with u_boot_console.log.section('Test Case 1-a, before reboot'): with u_boot_console.log.section('Test Case 1-a, before reboot'):
@@ -103,13 +104,13 @@ class TestEfiCapsuleFirmwareSignedFit(object):
def test_efi_capsule_auth2( def test_efi_capsule_auth2(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
""" """Test Case 2
Test Case 2 - Update U-Boot on SPI Flash, FIT image format Update U-Boot on SPI Flash, FIT image format
0x100000-0x150000: U-Boot binary (but dummy) 0x100000-0x150000: U-Boot binary (but dummy)
If the capsule is signed but with an invalid key, If the capsule is signed but with an invalid key,
the authentication should fail and the firmware the authentication should fail and the firmware
not be updated. not be updated.
""" """
disk_img = efi_capsule_data disk_img = efi_capsule_data
with u_boot_console.log.section('Test Case 2-a, before reboot'): with u_boot_console.log.section('Test Case 2-a, before reboot'):
@@ -182,12 +183,12 @@ class TestEfiCapsuleFirmwareSignedFit(object):
def test_efi_capsule_auth3( def test_efi_capsule_auth3(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
""" """Test Case 3
Test Case 3 - Update U-Boot on SPI Flash, FIT image format Update U-Boot on SPI Flash, FIT image format
0x100000-0x150000: U-Boot binary (but dummy) 0x100000-0x150000: U-Boot binary (but dummy)
If the capsule is not signed, the authentication If the capsule is not signed, the authentication
should fail and the firmware not be updated. should fail and the firmware not be updated.
""" """
disk_img = efi_capsule_data disk_img = efi_capsule_data
with u_boot_console.log.section('Test Case 3-a, before reboot'): with u_boot_console.log.section('Test Case 3-a, before reboot'):

38
test/py/tests/test_efi_capsule/test_capsule_firmware_signed_raw.py
View File

@@ -1,10 +1,8 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# Copyright (c) 2021, Linaro Limited # Copyright (c) 2021, Linaro Limited
# Author: AKASHI Takahiro <takahiro.akashi@linaro.org> # Author: AKASHI Takahiro <takahiro.akashi@linaro.org>
#
# U-Boot UEFI: Firmware Update (Signed capsule with raw images) Test
""" """U-Boot UEFI: Firmware Update (Signed capsule with raw images) Test
This test verifies capsule-on-disk firmware update This test verifies capsule-on-disk firmware update
with signed capsule files containing raw images with signed capsule files containing raw images
""" """
@@ -23,15 +21,17 @@ from capsule_defs import CAPSULE_DATA_DIR, CAPSULE_INSTALL_DIR
@pytest.mark.buildconfigspec('cmd_nvedit_efi') @pytest.mark.buildconfigspec('cmd_nvedit_efi')
@pytest.mark.buildconfigspec('cmd_sf') @pytest.mark.buildconfigspec('cmd_sf')
@pytest.mark.slow @pytest.mark.slow
class TestEfiCapsuleFirmwareSignedRaw(object): class TestEfiCapsuleFirmwareSignedRaw():
"""Firmware Update (Signed capsule with raw images) Test
"""
def test_efi_capsule_auth1( def test_efi_capsule_auth1(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
""" """Test Case 1 - Update U-Boot on SPI Flash, raw image format
Test Case 1 - Update U-Boot on SPI Flash, raw image format 0x100000-0x150000: U-Boot binary (but dummy)
0x100000-0x150000: U-Boot binary (but dummy)
If the capsule is properly signed, the authentication If the capsule is properly signed, the authentication
should pass and the firmware be updated. should pass and the firmware be updated.
""" """
disk_img = efi_capsule_data disk_img = efi_capsule_data
with u_boot_console.log.section('Test Case 1-a, before reboot'): with u_boot_console.log.section('Test Case 1-a, before reboot'):
@@ -100,13 +100,12 @@ class TestEfiCapsuleFirmwareSignedRaw(object):
def test_efi_capsule_auth2( def test_efi_capsule_auth2(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
""" """Test Case 2 - Update U-Boot on SPI Flash, raw image format
Test Case 2 - Update U-Boot on SPI Flash, raw image format 0x100000-0x150000: U-Boot binary (but dummy)
0x100000-0x150000: U-Boot binary (but dummy)
If the capsule is signed but with an invalid key, If the capsule is signed but with an invalid key,
the authentication should fail and the firmware the authentication should fail and the firmware
not be updated. not be updated.
""" """
disk_img = efi_capsule_data disk_img = efi_capsule_data
with u_boot_console.log.section('Test Case 2-a, before reboot'): with u_boot_console.log.section('Test Case 2-a, before reboot'):
@@ -179,12 +178,11 @@ class TestEfiCapsuleFirmwareSignedRaw(object):
def test_efi_capsule_auth3( def test_efi_capsule_auth3(
self, u_boot_config, u_boot_console, efi_capsule_data): self, u_boot_config, u_boot_console, efi_capsule_data):
""" """Test Case 3 - Update U-Boot on SPI Flash, raw image format
Test Case 3 - Update U-Boot on SPI Flash, raw image format 0x100000-0x150000: U-Boot binary (but dummy)
0x100000-0x150000: U-Boot binary (but dummy)
If the capsule is not signed, the authentication If the capsule is not signed, the authentication
should fail and the firmware not be updated. should fail and the firmware not be updated.
""" """
disk_img = efi_capsule_data disk_img = efi_capsule_data
with u_boot_console.log.section('Test Case 3-a, before reboot'): with u_boot_console.log.section('Test Case 3-a, before reboot'):