git/list[1] front-page[2] threads[3] people[4] search[5] about
 

RE: [PATCH v2 4/4] show-branch tests: add missing tests

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Jun 17, 2021, 21:44 UTC
Message-ID
<60cbc22e3db95_129920882@natae.notmuch>
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.
Show 68 quoted lines
> --- 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
Previous: Ævar Arnfjörð BjarmasonNext: Ævar Arnfjörð Bjarmason
Message 14 of 17 in “show-branch: add missing tests, trivial color output fix”
  1. 0/4 show-branch: add missing tests, trivial color output fixÆvar Arnfjörð Bjarmason, Jun 14, 2021
  2. 3/4 show-branch: fix and test --color outputÆvar Arnfjörð Bjarmason, Jun 14, 2021
  3. 4/4 show-branch tests: add missing testsÆvar Arnfjörð Bjarmason, Jun 14, 2021
  4. Michael J GruberJun 15, 2021
  5. 1/4 show-branch tests: rename the one "show-branch" test fileÆvar Arnfjörð Bjarmason, Jun 14, 2021
  6. 2/4 show-branch tests: modernize test codeÆvar Arnfjörð Bjarmason, Jun 14, 2021
  7. Junio C HamanoJun 15, 2021
  8. 0/4 show-branch: add missing tests, trivial color output changeÆvar Arnfjörð Bjarmason, Jun 17, 2021
  9. 1/4 show-branch tests: rename the one "show-branch" test fileÆvar Arnfjörð Bjarmason, Jun 17, 2021
  10. Felipe ContrerasJun 17, 2021
  11. 2/4 show-branch tests: modernize test codeÆvar Arnfjörð Bjarmason, Jun 17, 2021
  12. Felipe ContrerasJun 17, 2021
  13. 4/4 show-branch tests: add missing testsÆvar Arnfjörð Bjarmason, Jun 17, 2021
  14. Felipe ContrerasJun 17, 2021
  15. 3/4 show-branch: don't <COLOR></RESET> for space charactersÆvar Arnfjörð Bjarmason, Jun 17, 2021
  16. Felipe ContrerasJun 17, 2021
  17. Felipe ContrerasJun 17, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.