summaryrefslogtreecommitdiff
path: root/src/ukify
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-04-21 08:32:09 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2023-05-03 12:29:41 +0200
commit3f7e77fae1d3915c654d847a8b6c229767fe71e5 (patch)
tree306bf0f38cab8ddf1cdf15ee8e3bbddeda7ec64e /src/ukify
parentcb3b451e11e5dc32f12560c63e36bacb8df164f4 (diff)
downloadsystemd-3f7e77fae1d3915c654d847a8b6c229767fe71e5.tar.gz
test_ukify: fix two failing tests
Fixup for 22ad038ac6e4fe5e4a68555f0e70bd0a16fb5616 and 3fc5eed47091363247012454df458e1a3303bf12. It seems that the tests are not executed properly in CI. Nevertheless, test-ukify appears in logs: rpm-build:fedora-rawhide-x86_64: 409/1191 systemd / test-ukify OK 0.16s This is strange.
Diffstat (limited to 'src/ukify')
-rwxr-xr-xsrc/ukify/test/test_ukify.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/ukify/test/test_ukify.py b/src/ukify/test/test_ukify.py
index 1f468906d3..7b9f855ff3 100755
--- a/src/ukify/test/test_ukify.py
+++ b/src/ukify/test/test_ukify.py
@@ -91,7 +91,7 @@ def test_parse_args_many():
assert opts.sb_key == 'SBKEY'
assert opts.sb_cert == 'SBCERT'
assert opts.sign_kernel is False
- assert opts.tools == pathlib.Path('TOOLZ/')
+ assert opts.tools == [pathlib.Path('TOOLZ/')]
assert opts.output == pathlib.Path('OUTPUT')
assert opts.measure is False
@@ -109,13 +109,11 @@ def test_parse_sections():
assert opts.sections[0].name == 'test'
assert isinstance(opts.sections[0].content, pathlib.Path)
assert opts.sections[0].tmpfile
- assert opts.sections[0].offset is None
assert opts.sections[0].measure is False
assert opts.sections[1].name == 'test2'
assert opts.sections[1].content == pathlib.Path('FILE')
assert opts.sections[1].tmpfile is None
- assert opts.sections[1].offset is None
assert opts.sections[1].measure is False
def test_help(capsys):
@@ -242,7 +240,6 @@ def test_uname_scraping(kernel_initrd):
uname = ukify.Uname.scrape(kernel_initrd[0])
assert re.match(r'\d+\.\d+\.\d+', uname)
-
def test_efi_signing(kernel_initrd, tmpdir):
if kernel_initrd is None:
pytest.skip('linux+initrd not found')