From 48682646f72c7496c14fd6a04b92711f057b730d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= Date: Thu, 20 Aug 2026 13:49:54 +0200 Subject: [PATCH] Change scope of grub2_bootloader_argument templated tests Some test scenarios test correct handling of *values* of bootloader arguments. But, not all arguments have values, some arguments are value-less, for example `nousb`. For the value-less arguments it doesn't make sense to test the correct handling of values. Some tests that currently attempt to do this are broken. We will fix it by disabling the test scenarios. We will use the well-known "trick" of setting the `# platform` header to `Not Applicable` if the bootloader argument isn't supposed to have any value. These are rules where the template isn't given the `arg_value` or `arg_variable` parameter. Fixes failing templated test scenario `wrong_value_entries.fail.sh` in rule `grub2_nousb_argument`. --- .../tests/wrong_value_entries.fail.sh | 4 ++++ .../tests/wrong_value_etcdefault.fail.sh | 4 ++++ .../tests/wrong_value_etcdefault_dir.fail.sh | 4 ++++ .../wrong_value_etcdefaultgrub_recovery_disabled.fail.sh | 5 +++++ .../tests/wrong_value_grubenv.fail.sh | 4 ++++ 5 files changed, 21 insertions(+) diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh index 7fb9cb04bc79..36e69c0b5a7c 100644 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_entries.fail.sh @@ -1,6 +1,10 @@ #!/bin/bash +{{% if not ARG_VALUE and not ARG_VARIABLE %}} +# platform = Not Applicable +{{% else %}} # platform = multi_platform_fedora,multi_platform_rhel +{{% endif %}} # packages = grub2,grubby {{%- if ARG_VARIABLE %}} diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault.fail.sh index 01e8dd0b2734..eacc8d8a4484 100644 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault.fail.sh +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault.fail.sh @@ -1,6 +1,10 @@ #!/bin/bash +{{% if not ARG_VALUE and not ARG_VARIABLE %}} +# platform = Not Applicable +{{% else %}} # platform = multi_platform_all +{{% endif %}} {{%- if 'ubuntu' in product %}} # packages = grub2 diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault_dir.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault_dir.fail.sh index bf4704bc6e73..36b8c3068596 100644 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault_dir.fail.sh +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefault_dir.fail.sh @@ -1,6 +1,10 @@ #!/bin/bash +{{% if not ARG_VALUE and not ARG_VARIABLE %}} +# platform = Not Applicable +{{% else %}} # platform = multi_platform_ubuntu +{{% endif %}} # packages = grub2 {{%- if ARG_VARIABLE %}} diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefaultgrub_recovery_disabled.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefaultgrub_recovery_disabled.fail.sh index 07756501bf65..2ce50ff96683 100644 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefaultgrub_recovery_disabled.fail.sh +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_etcdefaultgrub_recovery_disabled.fail.sh @@ -1,5 +1,10 @@ #!/bin/bash + +{{% if not ARG_VALUE and not ARG_VARIABLE %}} +# platform = Not Applicable +{{% else %}} # platform = multi_platform_all +{{% endif %}} {{%- if ARG_VARIABLE %}} # variables = {{{ ARG_VARIABLE }}}={{{ TEST_VALUE_PASS }}} diff --git a/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh b/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh index c79c99bd93ce..865c5c3953bb 100644 --- a/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh +++ b/shared/templates/grub2_bootloader_argument/tests/wrong_value_grubenv.fail.sh @@ -1,6 +1,10 @@ #!/bin/bash +{{% if not ARG_VALUE and not ARG_VARIABLE %}} +# platform = Not Applicable +{{% else %}} # platform = Oracle Linux 8,Red Hat Enterprise Linux 8 +{{% endif %}} # packages = grub2,grubby {{%- if ARG_VARIABLE %}}