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 <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Jul 19, 2022 at 18:32 UTC
0011f94a4f05d5311a4f3223da8caf3bfbb9e293
4 files changed
+7
-8
t/lib-proto-disable.sh
+3
-3
@@ -1,7 +1,7 @@
1
# Test routines for checking protocol disabling.
2
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 () {
5
desc=$1
6
proto=$2
7
url=$3
@@ -183,7 +183,7 @@ test_config () {
183
# $2 - machine-readable name of the protocol
184
# $3 - the URL to try cloning
185
test_proto () {
186
- test_whitelist "$@"
186
+ test_allow_var "$@"
187
188
test_config "$@"
189
}
t/t5812-proto-disable-http.sh
+1
-1
@@ -16,7 +16,7 @@ test_expect_success 'create git-accessible repo' '
16
17
test_proto "smart http" http "$HTTPD_URL/smart/repo.git"
18
19
-test_expect_success 'curl redirects respect whitelist' '
19
+test_expect_success 'http(s) transport respects GIT_ALLOW_PROTOCOL' '
20
test_must_fail env GIT_ALLOW_PROTOCOL=http:https \
21
GIT_SMART_HTTP=0 \
22
git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr &&
t/t5815-submodule-protos.sh
+2
-2
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-test_description='test protocol whitelisting with submodules'
3
+test_description='test protocol filtering with submodules'
4
. ./test-lib.sh
5
. "$TEST_DIRECTORY"/lib-proto-disable.sh
6
@@ -36,7 +36,7 @@ test_expect_success 'update of ext not allowed' '
36
test_must_fail git -C dst submodule update ext-module
37
'
38
39
-test_expect_success 'user can override whitelist' '
39
+test_expect_success 'user can filter protocols with GIT_ALLOW_PROTOCOL' '
40
GIT_ALLOW_PROTOCOL=ext git -C dst submodule update ext-module
41
'
42
t/test-lib-functions.sh
+1
-2
@@ -651,8 +651,7 @@ test_set_prereq () {
651
# test_unset_prereq()
652
!*)
653
;;
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
655
SYMLINKS)
656
;;
657
# Inspecting whether GIT_TEST_FAIL_PREREQS is on