diff mbox series

[06/10] t5703: adjust a test case for the upcoming default branch name

Message ID 0d2511d18fb2908b1049afe4da7494f6ed7e26e8.1603135903.git.gitgitgadget@gmail.com
State New
Headers show
Series Prepare for changing the default branch name main (last manual part) | expand

Commit Message

Johannes Schindelin Oct. 19, 2020, 7:31 p.m. UTC
From: Johannes Schindelin <johannes.schindelin@gmx.de>

We want to rename the default branch name used by `git init` in the near
future, using `main` as the new name.

In preparation for that, we adjust a test case that wants to rename the
default branch to a different name that however has the same length. We
use `none` as that name because it matches the length of `main`.

As this test case cannot possibly pass until the default branch name is
_actually_ changed, we temporarily guard it behind a special-purpose
prereq, until the test suite is fully converted to use that new default
branch name.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
 t/t5703-upload-pack-ref-in-want.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Junio C Hamano Oct. 21, 2020, 10:34 p.m. UTC | #1
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:

> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> We want to rename the default branch name used by `git init` in the near
> future, using `main` as the new name.
>
> In preparation for that, we adjust a test case that wants to rename the
> default branch to a different name that however has the same length. We
> use `none` as that name because it matches the length of `main`.

The original chose word that not only is the same length but is
similarly spell (master vs raster).  Perhaps mirroring that
arrangement and picking 'rain' would have been even a better taste,
but this is good enough ;-)

The test pieces in this script seem to be arranged to be mostly
independent from each other, and especially because this one is at
the end of the script, making it run only when 'main' is in use,
and skipping otherwise, would not hurt anybody else.  We just need
to make sure that nobody adds new tests after this one that may be
affected by the allowRefInWant configuration setting.

Looking good.

Thanks.

> -test_expect_success 'server loses a ref - ref in want' '
> +test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' '
>  	git -C "$REPO" config uploadpack.allowRefInWant true &&
>  	rm -rf local &&
>  	cp -r "$LOCAL_PRISTINE" local &&
> -	echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
> +	echo "s/main/none/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
>  	test_must_fail git -C local fetch 2>err &&
>  
> -	test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
> +	test_i18ngrep "fatal: remote error: unknown ref refs/heads/none" err
>  '
>  
>  # DO NOT add non-httpd-specific tests here, because the last part of this
diff mbox series

Patch

diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index d9ecf0f4a9..67f83e7c9b 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -383,14 +383,14 @@  test_expect_success 'server is initially behind - ref in want' '
 	test_cmp expected actual
 '
 
-test_expect_success 'server loses a ref - ref in want' '
+test_expect_success PREPARE_FOR_MAIN_BRANCH 'server loses a ref - ref in want' '
 	git -C "$REPO" config uploadpack.allowRefInWant true &&
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
-	echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
+	echo "s/main/none/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
 	test_must_fail git -C local fetch 2>err &&
 
-	test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
+	test_i18ngrep "fatal: remote error: unknown ref refs/heads/none" err
 '
 
 # DO NOT add non-httpd-specific tests here, because the last part of this