Merge pull request #28741 from keszybz/minor-tweaks-for-recent-patches

Minor tweaks for recent patches

src/kernel-install/60-ukify.install.in

@@ -175,7 +175,7 @@ def initrd_list(opts) -> list[Path]:
     microcode = sorted(opts.staging_area.glob('microcode/*'))
     initrd = sorted(opts.staging_area.glob('initrd*'))
 
-    #Order taken from 90-loaderentry.install
+    # Order taken from 90-loaderentry.install
     return [*microcode, *opts.initrd, *initrd]
 
 

src/ukify/test/test_ukify.py

@@ -144,10 +144,8 @@ def test_apply_config(tmp_path):
     assert ns.phase_path_groups == [['enter-initrd:leave-initrd:sysinit:ready:shutdown:final']]
 
 def test_parse_args_minimal():
-    try:
+    with pytest.raises(ValueError):
         ukify.parse_args([])
-    except ValueError as e:
-        print(f'expected failure: {e}')
 
     opts = ukify.parse_args('arg1 arg2'.split())
     assert opts.linux == pathlib.Path('arg1')