aboutsummaryrefslogtreecommitdiff
path: root/test/py/tests/test_efi_bootmgr/conftest.py
diff options
context:
space:
mode:
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2022-03-27 10:03:33 +0200
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2022-03-31 19:06:16 +0200
commit86fa918df6c7937bcd4afb89fed7f3043c65df62 (patch)
tree285b17903ef096e27deac7faa8d7d91960c77f22 /test/py/tests/test_efi_bootmgr/conftest.py
parentedd8f66a0c77655cd63ba32e0393f4f6b806b9a8 (diff)
test: fix pylint warnings in test_efi_bootmgr
* 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>
Diffstat (limited to 'test/py/tests/test_efi_bootmgr/conftest.py')
-rw-r--r--test/py/tests/test_efi_bootmgr/conftest.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/test/py/tests/test_efi_bootmgr/conftest.py b/test/py/tests/test_efi_bootmgr/conftest.py
index 69008fddce..a0a754afbe 100644
--- a/test/py/tests/test_efi_bootmgr/conftest.py
+++ b/test/py/tests/test_efi_bootmgr/conftest.py
@@ -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)
-
- print(image_path)
+ check_call(f'virt-make-fs --partition=gpt --size=+1M --type=vfat {mnt_point} {image_path}',
+ shell=True)
- yield image_path
+ return image_path