From: Felipe Contreras <felipe.contreras@gmail.com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>, git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"Michael J Gruber" <git@grubix.eu>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: RE: [PATCH v2 4/4] show-branch tests: add missing tests
Date: Thu, 17 Jun 2021 16:44:14 -0500 [thread overview]
Message-ID: <60cbc22e3db95_129920882@natae.notmuch> (raw)
In-Reply-To: <patch-4.4-dde0177235-20210617T105245Z-avarab@gmail.com>
Ævar Arnfjörð Bjarmason wrote:
> Add missing tests for --remotes, --list and --merge-base. These are
> not exhaustive, but better than the nothing we have now.
Indeed, this is better.
> --- a/t/t3202-show-branch.sh
> +++ b/t/t3202-show-branch.sh
> @@ -85,4 +85,65 @@ test_expect_success 'show-branch --color output' '
> test_cmp expect actual
> '
>
> +test_expect_success 'show branch --remotes' '
> + cat >expect.err <<-\EOF &&
> + No revs to be shown.
> + EOF
> + git show-branch -r 2>actual.err >actual.out &&
> + test_cmp expect.err actual.err &&
> + test_must_be_empty actual.out
> +'
> +
> +test_expect_success 'setup show branch --list' '
> + sed "s/^> //" >expect <<-\EOF
> + > [branch1] branch1
> + > [branch2] branch2
> + > [branch3] branch3
> + > [branch4] branch4
> + > [branch5] branch5
> + > [branch6] branch6
> + > [branch7] branch7
> + > [branch8] branch8
> + > [branch9] branch9
> + > * [branch10] branch10
> + EOF
> +'
> +
> +test_expect_success 'show branch --list' '
> + git show-branch --list $(cat branches.sorted) >actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'show branch --list has no --color output' '
> + git show-branch --color=always --list $(cat branches.sorted) >actual &&
> + test_cmp expect actual
> +'
> +
> +test_expect_success 'show branch --merge-base with one argument' '
> + for branch in $(cat branches.sorted)
> + do
> + git rev-parse $branch >expect &&
> + git show-branch --merge-base $branch >actual &&
> + test_cmp expect actual
> + done
> +'
> +
> +test_expect_success 'show branch --merge-base with two arguments' '
> + for branch in $(cat branches.sorted)
> + do
> + git rev-parse initial >expect &&
> + git show-branch --merge-base initial $branch >actual &&
> + test_cmp expect actual
> + done
> +'
> +
> +test_expect_success 'show branch --merge-base with N arguments' '
> + git rev-parse initial >expect &&
> + git show-branch --merge-base $(cat branches.sorted) >actual &&
> + test_cmp expect actual &&
> +
> + git merge-base $(cat branches.sorted) >actual &&
> + test_cmp expect actual
> +'
> +
> test_done
All these look good to me.
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2021-06-17 21:44 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-14 17:18 [PATCH 0/4] show-branch: add missing tests, trivial color output fix Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 1/4] show-branch tests: rename the one "show-branch" test file Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 2/4] show-branch tests: modernize test code Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 3/4] show-branch: fix and test --color output Ævar Arnfjörð Bjarmason
2021-06-14 17:18 ` [PATCH 4/4] show-branch tests: add missing tests Ævar Arnfjörð Bjarmason
2021-06-15 9:24 ` Michael J Gruber
2021-06-15 3:11 ` [PATCH 0/4] show-branch: add missing tests, trivial color output fix Junio C Hamano
2021-06-17 10:53 ` [PATCH v2 0/4] show-branch: add missing tests, trivial color output change Ævar Arnfjörð Bjarmason
2021-06-17 10:53 ` [PATCH v2 1/4] show-branch tests: rename the one "show-branch" test file Ævar Arnfjörð Bjarmason
2021-06-17 21:16 ` Felipe Contreras
2021-06-17 10:53 ` [PATCH v2 2/4] show-branch tests: modernize test code Ævar Arnfjörð Bjarmason
2021-06-17 21:29 ` Felipe Contreras
2021-06-17 10:53 ` [PATCH v2 3/4] show-branch: don't <COLOR></RESET> for space characters Ævar Arnfjörð Bjarmason
2021-06-17 21:41 ` Felipe Contreras
2021-06-17 10:53 ` [PATCH v2 4/4] show-branch tests: add missing tests Ævar Arnfjörð Bjarmason
2021-06-17 21:44 ` Felipe Contreras [this message]
2021-06-17 21:46 ` [PATCH v2 0/4] show-branch: add missing tests, trivial color output change Felipe Contreras
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=60cbc22e3db95_129920882@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@grubix.eu \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.