| Message ID | 20210202205824.1085853-11-philmd@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | misc: Replace the words 'blacklist/whitelist' | expand |
On Tue, Feb 02, 2021 at 09:58:22PM +0100, Philippe Mathieu-Daudé wrote: > Follow the inclusive terminology from the "Conscious Language in your > Open Source Projects" guidelines [*] and replace the words "blacklist" > and "whitelist" appropriately. > > [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md > > Signed-off-by: Philippe Mathieu-Daudé <philmd@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 328fd05a4c9..b1d3f5fad67 100755 > --- a/tests/qemu-iotests/149 > +++ b/tests/qemu-iotests/149 > @@ -500,7 +500,7 @@ configs = [ > > ] > > -blacklist = [ > +denylist = [ > # We don't have a cast-6 cipher impl for QEMU yet > "cast6-256-xts-plain64-sha1", > "cast6-128-xts-plain64-sha1", > @@ -510,17 +510,17 @@ blacklist = [ > "twofish-192-xts-plain64-sha1", > ] "skiplist" better describes the purpose of this. > > -whitelist = [] > +allowlist = [] > if "LUKS_CONFIG" in os.environ: > - whitelist = os.environ["LUKS_CONFIG"].split(",") > + allowlist = os.environ["LUKS_CONFIG"].split(",") And "filterlist" > > for config in configs: > - if config.name in blacklist: > - iotests.log("Skipping %s in blacklist" % config.name) > + if config.name in denylist: > + iotests.log("Skipping %s in denylist" % 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) Regards, Daniel
Am 03.02.2021 um 11:28 hat Daniel P. Berrangé geschrieben: > On Tue, Feb 02, 2021 at 09:58:22PM +0100, Philippe Mathieu-Daudé wrote: > > Follow the inclusive terminology from the "Conscious Language in your > > Open Source Projects" guidelines [*] and replace the words "blacklist" > > and "whitelist" appropriately. We're not doing access control here, so allowlist/denylist are not the appropriate words to use here. > > [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md > > > > Signed-off-by: Philippe Mathieu-Daudé <philmd@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 328fd05a4c9..b1d3f5fad67 100755 > > --- a/tests/qemu-iotests/149 > > +++ b/tests/qemu-iotests/149 > > @@ -500,7 +500,7 @@ configs = [ > > > > ] > > > > -blacklist = [ > > +denylist = [ > > # We don't have a cast-6 cipher impl for QEMU yet > > "cast6-256-xts-plain64-sha1", > > "cast6-128-xts-plain64-sha1", > > @@ -510,17 +510,17 @@ blacklist = [ > > "twofish-192-xts-plain64-sha1", > > ] > > "skiplist" better describes the purpose of this. That it's a list is very obvious from the code and doesn't tell anything about the content. How about skip_configs? > > > > -whitelist = [] > > +allowlist = [] > > if "LUKS_CONFIG" in os.environ: > > - whitelist = os.environ["LUKS_CONFIG"].split(",") > > + allowlist = os.environ["LUKS_CONFIG"].split(",") > > And "filterlist" test_configs? configs_to_test? > > > > for config in configs: > > - if config.name in blacklist: > > - iotests.log("Skipping %s in blacklist" % config.name) > > + if config.name in denylist: > > + iotests.log("Skipping %s in denylist" % 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 The messages need to be updates accordingly, of course. Kevin
On Wed, Feb 03, 2021 at 04:41:33PM +0100, Kevin Wolf wrote: > Am 03.02.2021 um 11:28 hat Daniel P. Berrangé geschrieben: > > On Tue, Feb 02, 2021 at 09:58:22PM +0100, Philippe Mathieu-Daudé wrote: > > > Follow the inclusive terminology from the "Conscious Language in your > > > Open Source Projects" guidelines [*] and replace the words "blacklist" > > > and "whitelist" appropriately. > > We're not doing access control here, so allowlist/denylist are not the > appropriate words to use here. > > > > [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md > > > > > > Signed-off-by: Philippe Mathieu-Daudé <philmd@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 328fd05a4c9..b1d3f5fad67 100755 > > > --- a/tests/qemu-iotests/149 > > > +++ b/tests/qemu-iotests/149 > > > @@ -500,7 +500,7 @@ configs = [ > > > > > > ] > > > > > > -blacklist = [ > > > +denylist = [ > > > # We don't have a cast-6 cipher impl for QEMU yet > > > "cast6-256-xts-plain64-sha1", > > > "cast6-128-xts-plain64-sha1", > > > @@ -510,17 +510,17 @@ blacklist = [ > > > "twofish-192-xts-plain64-sha1", > > > ] > > > > "skiplist" better describes the purpose of this. > > That it's a list is very obvious from the code and doesn't tell anything > about the content. How about skip_configs? Sure > > > > > > -whitelist = [] > > > +allowlist = [] > > > if "LUKS_CONFIG" in os.environ: > > > - whitelist = os.environ["LUKS_CONFIG"].split(",") > > > + allowlist = os.environ["LUKS_CONFIG"].split(",") > > > > And "filterlist" > > test_configs? configs_to_test? The list of configs to test is built up by the code. This env variable is just a hack to let me filter the configs for debugging. Just "filter_configs" is ok. > > > > > > > for config in configs: > > > - if config.name in blacklist: > > > - iotests.log("Skipping %s in blacklist" % config.name) > > > + if config.name in denylist: > > > + iotests.log("Skipping %s in denylist" % 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 > > The messages need to be updates accordingly, of course. > > Kevin Regards, Daniel
diff --git a/tests/qemu-iotests/149 b/tests/qemu-iotests/149 index 328fd05a4c9..b1d3f5fad67 100755 --- a/tests/qemu-iotests/149 +++ b/tests/qemu-iotests/149 @@ -500,7 +500,7 @@ configs = [ ] -blacklist = [ +denylist = [ # We don't have a cast-6 cipher impl for QEMU yet "cast6-256-xts-plain64-sha1", "cast6-128-xts-plain64-sha1", @@ -510,17 +510,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 denylist: + iotests.log("Skipping %s in denylist" % 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 6877ab6c4a4..19ae092987b 100644 --- a/tests/qemu-iotests/149.out +++ b/tests/qemu-iotests/149.out @@ -478,7 +478,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 denylist # ================= dm-crypt aes-256-cbc-plain-sha1 ================= # Create image truncate TEST_DIR/luks-aes-256-cbc-plain-sha1.img --size 4194304MB @@ -1319,7 +1319,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 denylist # ================= dm-crypt serpent-128-xts-plain64-sha1 ================= # Create image truncate TEST_DIR/luks-serpent-128-xts-plain64-sha1.img --size 4194304MB @@ -1560,8 +1560,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 denylist +Skipping cast6-192-xts-plain64-sha1 in denylist # ================= dm-crypt aes-256-xts-plain64-sha224 ================= # Create image truncate TEST_DIR/luks-aes-256-xts-plain64-sha224.img --size 4194304MB
Follow the inclusive terminology from the "Conscious Language in your Open Source Projects" guidelines [*] and replace the words "blacklist" and "whitelist" appropriately. [*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- tests/qemu-iotests/149 | 14 +++++++------- tests/qemu-iotests/149.out | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-)