From: Dorcas Litunya <anonolitunya@gmail.com>
To: christian.couder@gmail.com
Cc: anonolitunya@gmail.com, git@vger.kernel.org, gitster@pobox.com
Date: Mon, 16 Oct 2023 18:57:59 +0300 [thread overview]
Message-ID: <ZS1dh8RcWD8vzBzM@dorcaslitunya-virtual-machine> (raw)
Bcc:
Subject: Re: [PATCH] t/t7601: Modernize test scripts using functions
Reply-To:
In-Reply-To: <20231016152113.135970-1-anonolitunya@gmail.com>
On Mon, Oct 16, 2023 at 06:21:00PM +0300, Dorcas AnonoLitunya wrote:
> The test script is currently using the command format 'test -f' to
> check for existence or absence of files.
>
> Replace it with new helper functions following the format
> 'test_path_is_file'.
>
> Consequently, the patch also replaces the inverse command '! test -f' or
> 'test ! -f' with new helper function following the format
> 'test_path_is_missing'
>
> This adjustment using helper functions makes the code more readable and
> easier to understand.
>
> Signed-off-by: Dorcas AnonoLitunya <anonolitunya@gmail.com>
> ---
> t/t7601-merge-pull-config.sh | 24 ++++++++++++------------
> 1 file changed, 12 insertions(+), 12 deletions(-)
>
> diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
> index bd238d89b0..e08767df66 100755
> --- a/t/t7601-merge-pull-config.sh
> +++ b/t/t7601-merge-pull-config.sh
> @@ -349,13 +349,13 @@ test_expect_success 'Cannot rebase with multiple heads' '
>
> test_expect_success 'merge c1 with c2' '
> git reset --hard c1 &&
> - test -f c0.c &&
> - test -f c1.c &&
> - test ! -f c2.c &&
> - test ! -f c3.c &&
> + test_path_is_file c0.c &&
> + test_path_is_file c1.c &&
> + test_path_is_missing c2.c &&
> + test_path_is_missing c3.c &&
> git merge c2 &&
> - test -f c1.c &&
> - test -f c2.c
> + test_path_is_file c1.c &&
> + test_path_is_file c2.c
> '
>
> test_expect_success 'fast-forward pull succeeds with "true" in pull.ff' '
> @@ -411,8 +411,8 @@ test_expect_success 'merge c1 with c2 (ours in pull.twohead)' '
> git reset --hard c1 &&
> git config pull.twohead ours &&
> git merge c2 &&
> - test -f c1.c &&
> - ! test -f c2.c
> + test_path_is_file c1.c &&
> + test_path_is_missing c2.c
> '
>
> test_expect_success 'merge c1 with c2 and c3 (recursive in pull.octopus)' '
> @@ -431,10 +431,10 @@ test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in pull.octo
> test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
> test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
> git diff --exit-code &&
> - test -f c0.c &&
> - test -f c1.c &&
> - test -f c2.c &&
> - test -f c3.c
> + test_path_is_file c0.c &&
> + test_path_is_file c1.c &&
> + test_path_is_file c2.c &&
> + test_path_is_file c3.c
> '
>
> conflict_count()
> --
> 2.42.0.345.gaab89be2eb
>
Please ignore this version as I had not indicated Outreachy in the
subject header. Thanks.
reply other threads:[~2023-10-16 15:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=ZS1dh8RcWD8vzBzM@dorcaslitunya-virtual-machine \
--to=anonolitunya@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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