Let's use 'unsupported_configs' and 'tested_configs' here
instead of non-inclusive words.
Signed-off-by: Thomas Huth
---
v3: Rewording according to the suggestions of Daniel:
- Replaced "cipher not supported" with "config not supported"
- Replaced "not in LUKS_CONFIG" with "by user request"
tests/qemu-iotests/149 | 16 +---
tests/qemu-iotests/149.out | 8
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149
index 2ae318f16f..c13343d7ef 100755
--- a/tests/qemu-iotests/149
+++ b/tests/qemu-iotests/149
@@ -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",
@@ -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)
diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out
index 2cc5b82f7c..72ca847159 100644
--- a/tests/qemu-iotests/149.out
+++ b/tests/qemu-iotests/149.out
@@ -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
@@ -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
@@ -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
--
2.42.0
