freshlybakedca.ke / git
Git fork
fork atom

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>

authored by

Derrick Stolee and committed by
Junio C Hamano 0011f94a 559c2c3d

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