Let's use 'allowlist' and 'ignorelist' here instead of
problematic words.
Signed-off-by: Thomas Huth <th...@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 = [
# 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(",")
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)
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)
continue
test_once(config, qemu_img=False)
diff --git a/tests/qemu-iotests/149.out b/tests/qemu-iotests/149.out
index 2cc5b82f7c..3a0066d6c8 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 in ignorelist
# ================= 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 in ignorelist
# ================= 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 in ignorelist
+Skipping cast6-192-xts-plain64-sha1 in ignorelist
# ================= dm-crypt aes-256-xts-plain64-sha224 =================
# Create image
truncate TEST_DIR/luks-aes-256-xts-plain64-sha224.img --size 4194304MB
--
2.41.0
