Skip to content

Commit

Permalink
tests/qemu-iotests/149: Use more inclusive language in this test
Browse files Browse the repository at this point in the history
Let's use 'unsupported_configs' and 'tested_configs' here
instead of non-inclusive words.

Message-ID: <20231122084000.809696-1-thuth@redhat.com>
Reviewed-by: "Daniel P. Berrangé" <berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
  • Loading branch information
huth committed Dec 4, 2023
1 parent 29b5d70 commit 5689d4b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
16 changes: 9 additions & 7 deletions tests/qemu-iotests/149
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ configs = [

]

blacklist = [
unsupported_configs = [
# We don't have a cast-6 cipher impl for QEMU yet
"cast6-256-xts-plain64-sha1",
"cast6-128-xts-plain64-sha1",
Expand All @@ -528,17 +528,19 @@ blacklist = [
"twofish-192-xts-plain64-sha1",
]

whitelist = []
# Optionally test only the configurations in the LUKS_CONFIG
# environment variable
tested_configs = None
if "LUKS_CONFIG" in os.environ:
whitelist = os.environ["LUKS_CONFIG"].split(",")
tested_configs = os.environ["LUKS_CONFIG"].split(",")

for config in configs:
if config.name in blacklist:
iotests.log("Skipping %s in blacklist" % config.name)
if config.name in unsupported_configs:
iotests.log("Skipping %s (config not supported)" % config.name)
continue

if len(whitelist) > 0 and config.name not in whitelist:
iotests.log("Skipping %s not in whitelist" % config.name)
if tested_configs is not None and config.name not in tested_configs:
iotests.log("Skipping %s (by user request)" % config.name)
continue

test_once(config, qemu_img=False)
Expand Down
8 changes: 4 additions & 4 deletions tests/qemu-iotests/149.out
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ sudo cryptsetup -q -v luksClose qiotest-145-cast5-128-cbc-plain64-sha1
# Delete image
unlink TEST_DIR/luks-cast5-128-cbc-plain64-sha1.img

Skipping cast6-256-xts-plain64-sha1 in blacklist
Skipping cast6-256-xts-plain64-sha1 (config not supported)
# ================= dm-crypt aes-256-cbc-plain-sha1 =================
# Create image
truncate TEST_DIR/luks-aes-256-cbc-plain-sha1.img --size 4194304MB
Expand Down Expand Up @@ -1297,7 +1297,7 @@ sudo cryptsetup -q -v luksClose qiotest-145-twofish-128-xts-plain64-sha1
# Delete image
unlink TEST_DIR/luks-twofish-128-xts-plain64-sha1.img

Skipping twofish-192-xts-plain64-sha1 in blacklist
Skipping twofish-192-xts-plain64-sha1 (config not supported)
# ================= dm-crypt serpent-128-xts-plain64-sha1 =================
# Create image
truncate TEST_DIR/luks-serpent-128-xts-plain64-sha1.img --size 4194304MB
Expand Down Expand Up @@ -1534,8 +1534,8 @@ sudo cryptsetup -q -v luksClose qiotest-145-serpent-192-xts-plain64-sha1
# Delete image
unlink TEST_DIR/luks-serpent-192-xts-plain64-sha1.img

Skipping cast6-128-xts-plain64-sha1 in blacklist
Skipping cast6-192-xts-plain64-sha1 in blacklist
Skipping cast6-128-xts-plain64-sha1 (config not supported)
Skipping cast6-192-xts-plain64-sha1 (config not supported)
# ================= dm-crypt aes-256-xts-plain64-sha224 =================
# Create image
truncate TEST_DIR/luks-aes-256-xts-plain64-sha224.img --size 4194304MB
Expand Down

0 comments on commit 5689d4b

Please sign in to comment.