Skip to content

Commit 0011f94

Browse files
derrickstoleegitster
authored andcommitted
t: avoid "whitelist"
The word "whitelist" has cultural implications that are not inclusive. Thankfully, it is not difficult to reword and avoid its use. Focus on changes in the test scripts, since most of the changes are in comments and test names. The renamed test_allow_var helper is only used once inside the widely-used test_proto helper. Signed-off-by: Derrick Stolee <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 559c2c3 commit 0011f94

File tree

4 files changed

+7
-8
lines changed

4 files changed

+7
-8
lines changed

t/lib-proto-disable.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Test routines for checking protocol disabling.
22

3-
# Test clone/fetch/push with GIT_ALLOW_PROTOCOL whitelist
4-
test_whitelist () {
3+
# Test clone/fetch/push with GIT_ALLOW_PROTOCOL environment variable
4+
test_allow_var () {
55
desc=$1
66
proto=$2
77
url=$3
@@ -183,7 +183,7 @@ test_config () {
183183
# $2 - machine-readable name of the protocol
184184
# $3 - the URL to try cloning
185185
test_proto () {
186-
test_whitelist "$@"
186+
test_allow_var "$@"
187187

188188
test_config "$@"
189189
}

t/t5812-proto-disable-http.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ test_expect_success 'create git-accessible repo' '
1616

1717
test_proto "smart http" http "$HTTPD_URL/smart/repo.git"
1818

19-
test_expect_success 'curl redirects respect whitelist' '
19+
test_expect_success 'http(s) transport respects GIT_ALLOW_PROTOCOL' '
2020
test_must_fail env GIT_ALLOW_PROTOCOL=http:https \
2121
GIT_SMART_HTTP=0 \
2222
git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr &&

t/t5815-submodule-protos.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
test_description='test protocol whitelisting with submodules'
3+
test_description='test protocol filtering with submodules'
44
. ./test-lib.sh
55
. "$TEST_DIRECTORY"/lib-proto-disable.sh
66

@@ -36,7 +36,7 @@ test_expect_success 'update of ext not allowed' '
3636
test_must_fail git -C dst submodule update ext-module
3737
'
3838

39-
test_expect_success 'user can override whitelist' '
39+
test_expect_success 'user can filter protocols with GIT_ALLOW_PROTOCOL' '
4040
GIT_ALLOW_PROTOCOL=ext git -C dst submodule update ext-module
4141
'
4242

t/test-lib-functions.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -651,8 +651,7 @@ test_set_prereq () {
651651
# test_unset_prereq()
652652
!*)
653653
;;
654-
# (Temporary?) whitelist of things we can't easily
655-
# pretend not to support
654+
# List of things we can't easily pretend to not support
656655
SYMLINKS)
657656
;;
658657
# Inspecting whether GIT_TEST_FAIL_PREREQS is on

0 commit comments

Comments
 (0)