From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Eduardo Otubo" <otubo@redhat.com>,
"Kevin Wolf" <kwolf@redhat.com>,
qemu-block@nongnu.org, "Peter Maydell" <peter.maydell@linaro.org>,
"Michael Roth" <michael.roth@amd.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PATCH 07/12] scripts/device-crash-test: Replace the word 'whitelist'
Date: Tue, 2 Feb 2021 21:58:19 +0100 [thread overview]
Message-ID: <20210202205824.1085853-8-philmd@redhat.com> (raw)
In-Reply-To: <20210202205824.1085853-1-philmd@redhat.com>
Follow the inclusive terminology from the "Conscious Language in your
Open Source Projects" guidelines [*] and replace the word "whitelist"
appropriately.
[*] https://github.com/conscious-lang/conscious-lang-docs/blob/main/faq.md
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
scripts/device-crash-test | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index 04118669ba7..6812de42f8c 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -41,18 +41,18 @@ logger = logging.getLogger('device-crash-test')
dbg = logger.debug
-# Purposes of the following whitelist:
+# Purposes of the following allowlist:
# * Avoiding verbose log messages when we find known non-fatal
# (exitcode=1) errors
# * Avoiding fatal errors when we find known crashes
# * Skipping machines/devices that are known not to work out of
# the box, when running in --quick mode
#
-# Keeping the whitelist updated is desirable, but not required,
+# Keeping the allowlist updated is desirable, but not required,
# because unexpected cases where QEMU exits with exitcode=1 will
# just trigger a INFO message.
-# Valid whitelist entry keys:
+# Valid allowlist entry keys:
# * accel: regexp, full match only
# * machine: regexp, full match only
# * device: regexp, full match only
@@ -62,7 +62,7 @@ dbg = logger.debug
# * expected: if True, QEMU is expected to always fail every time
# when testing the corresponding test case
# * loglevel: log level of log output when there's a match.
-ERROR_WHITELIST = [
+ERROR_ALLOWLIST = [
# Machines that won't work out of the box:
# MACHINE | ERROR MESSAGE
{'machine':'niagara', 'expected':True}, # Unable to load a firmware for -M niagara
@@ -187,9 +187,9 @@ ERROR_WHITELIST = [
def whitelistTestCaseMatch(wl, t):
- """Check if a test case specification can match a whitelist entry
+ """Check if a test case specification can match a allowlist entry
- This only checks if a whitelist entry is a candidate match
+ This only checks if a allowlist entry is a candidate match
for a given test case, it won't check if the test case
results/output match the entry. See whitelistResultMatch().
"""
@@ -206,16 +206,16 @@ def whitelistTestCaseMatch(wl, t):
def whitelistCandidates(t):
"""Generate the list of candidates that can match a test case"""
- for i, wl in enumerate(ERROR_WHITELIST):
+ for i, wl in enumerate(ERROR_ALLOWLIST):
if whitelistTestCaseMatch(wl, t):
yield (i, wl)
def findExpectedResult(t):
- """Check if there's an expected=True whitelist entry for a test case
+ """Check if there's an expected=True allowlist entry for a test case
Returns (i, wl) tuple, where i is the index in
- ERROR_WHITELIST and wl is the whitelist entry itself.
+ ERROR_ALLOWLIST and wl is the allowlist entry itself.
"""
for i, wl in whitelistCandidates(t):
if wl.get('expected'):
@@ -223,7 +223,7 @@ def findExpectedResult(t):
def whitelistResultMatch(wl, r):
- """Check if test case results/output match a whitelist entry
+ """Check if test case results/output match a allowlist entry
It is valid to call this function only if
whitelistTestCaseMatch() is True for the entry (e.g. on
@@ -237,10 +237,10 @@ def whitelistResultMatch(wl, r):
def checkResultWhitelist(r):
- """Look up whitelist entry for a given test case result
+ """Look up allowlist entry for a given test case result
Returns (i, wl) tuple, where i is the index in
- ERROR_WHITELIST and wl is the whitelist entry itself.
+ ERROR_ALLOWLIST and wl is the allowlist entry itself.
"""
for i, wl in whitelistCandidates(r['testcase']):
if whitelistResultMatch(wl, r):
@@ -544,7 +544,7 @@ def main():
if f:
i, wl = checkResultWhitelist(f)
- dbg("testcase: %r, whitelist match: %r", t, wl)
+ dbg("testcase: %r, allowlist match: %r", t, wl)
wl_stats.setdefault(i, []).append(f)
level = wl.get('loglevel', logging.DEBUG)
logFailure(f, level)
@@ -561,9 +561,9 @@ def main():
if args.debug:
stats = sorted([(len(wl_stats.get(i, [])), wl) for i, wl in
- enumerate(ERROR_WHITELIST)], key=lambda x: x[0])
+ enumerate(ERROR_ALLOWLIST)], key=lambda x: x[0])
for count, wl in stats:
- dbg("whitelist entry stats: %d: %r", count, wl)
+ dbg("allowlist entry stats: %d: %r", count, wl)
if fatal_failures:
for f in fatal_failures:
--
2.26.2
next prev parent reply other threads:[~2021-02-02 21:07 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-02 20:58 [PATCH 00/12] misc: Replace the words 'blacklist/whitelist' Philippe Mathieu-Daudé
2021-02-02 20:58 ` [PATCH 01/12] ui: Replace the word 'whitelist' Philippe Mathieu-Daudé
2021-02-03 9:43 ` Gerd Hoffmann
2021-02-03 10:04 ` Daniel P. Berrangé
2021-02-04 9:04 ` Philippe Mathieu-Daudé
2021-02-02 20:58 ` [PATCH 02/12] qga: Rename config key 'blacklist' as 'denylist' Philippe Mathieu-Daudé
2021-02-03 10:17 ` Daniel P. Berrangé
2021-02-04 9:45 ` Michal Suchánek
2021-02-04 12:29 ` Michal Suchánek
2021-02-02 20:58 ` [PATCH 03/12] qga: Replace '--blacklist' command line option by '--denylist' Philippe Mathieu-Daudé
2021-02-03 10:09 ` Daniel P. Berrangé
2021-02-03 12:45 ` BALATON Zoltan
2021-02-03 15:47 ` Kevin Wolf
2021-02-03 16:02 ` Michael Roth
2022-07-18 16:17 ` Thomas Huth
2021-02-02 20:58 ` [PATCH 04/12] qga: Replace the word 'blacklist' Philippe Mathieu-Daudé
2021-02-03 10:10 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 05/12] tools/virtiofsd: Replace the word 'whitelist' Philippe Mathieu-Daudé
2021-02-03 9:08 ` Dr. David Alan Gilbert
2021-02-03 10:11 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 06/12] scripts/tracetool: " Philippe Mathieu-Daudé
2021-02-03 10:12 ` Daniel P. Berrangé
2021-02-03 14:31 ` Stefan Hajnoczi
2021-02-02 20:58 ` Philippe Mathieu-Daudé [this message]
2021-02-03 9:14 ` [PATCH 07/12] scripts/device-crash-test: " Philippe Mathieu-Daudé
2021-02-03 10:14 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 08/12] seccomp: Replace the word 'blacklist' Philippe Mathieu-Daudé
2021-02-03 10:15 ` Daniel P. Berrangé
2021-02-03 10:41 ` Eduardo Otubo
2021-02-02 20:58 ` [PATCH 09/12] qemu-options: " Philippe Mathieu-Daudé
2021-02-03 10:25 ` Daniel P. Berrangé
2021-02-04 9:09 ` Philippe Mathieu-Daudé
2021-02-02 20:58 ` [PATCH 10/12] tests/qemu-iotests: Replace the words 'blacklist/whitelist' Philippe Mathieu-Daudé
2021-02-03 10:28 ` Daniel P. Berrangé
2021-02-03 15:41 ` Kevin Wolf
2021-02-03 15:50 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 11/12] tests/fp/fp-test: Replace the word 'blacklist' Philippe Mathieu-Daudé
2021-02-03 9:20 ` Alex Bennée
2021-02-03 10:29 ` Daniel P. Berrangé
2021-02-02 20:58 ` [PATCH 12/12] hw/vfio/pci-quirks: " Philippe Mathieu-Daudé
2021-02-02 22:13 ` Alex Williamson
2021-02-03 10:30 ` Daniel P. Berrangé
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210202205824.1085853-8-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=alex.williamson@redhat.com \
--cc=aurelien@aurel32.net \
--cc=dgilbert@redhat.com \
--cc=kraxel@redhat.com \
--cc=kwolf@redhat.com \
--cc=michael.roth@amd.com \
--cc=mreitz@redhat.com \
--cc=otubo@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).