Re: [PATCH] tests/qemu-iotests/149: Use more inclusive language in this test

[Paolo Bonzini]

On 11/9/23 19:09, Thomas Huth wrote:
> Let's use 'allowlist' and 'ignorelist' here instead of
> problematic words.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/qemu-iotests/149     | 14 +++++++-------
>   tests/qemu-iotests/149.out |  8 ++++----
>   2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
> index 2ae318f16f..42f627688a 100755
> --- a/tests/qemu-iotests/149
> +++ b/tests/qemu-iotests/149
> @@ -518,7 +518,7 @@ configs = [
>   
>   ]
>   
> -blacklist = [
> +ignorelist = [

unsupported_configs

>       # We don't have a cast-6 cipher impl for QEMU yet
>       "cast6-256-xts-plain64-sha1",
>       "cast6-128-xts-plain64-sha1",
> @@ -528,17 +528,17 @@ blacklist = [
>       "twofish-192-xts-plain64-sha1",
>   ]
>   
> -whitelist = []
> +allowlist = []
>   if "LUKS_CONFIG" in os.environ:
> -    whitelist = os.environ["LUKS_CONFIG"].split(",")
> +    allowlist = os.environ["LUKS_CONFIG"].split(",")

tested_configs

While at it:

-whitelist = []
+# Optionally test only the configurations in the LUKS_CONFIG
+# environment variable
+tested_configs = None

and below

-if len(whitelist) > 0 and config.name not in whitelist:
+if tested_configs is not None and config.name not in test_configs:

>   
>   for config in configs:
> -    if config.name in blacklist:
> -        iotests.log("Skipping %s in blacklist" % config.name)
> +    if config.name in ignorelist:
> +        iotests.log("Skipping %s in ignorelist" % config.name)

Skipping %s (cipher not supported)

Even better would be to change blacklist to a regular expression and 
make it just [ "^cast6-.*", "^twofish-.*" ], but I am not going to 
require that. :)

>           continue
>   
> -    if len(whitelist) > 0 and config.name not in whitelist:
> -        iotests.log("Skipping %s not in whitelist" % config.name)
> +    if len(allowlist) > 0 and config.name not in allowlist:
> +        iotests.log("Skipping %s not in allowlist" % config.name)

Skipping %s (not in LUKS_CONFIG)

Paolo