threads / patch / 52349

patcht1410: use test_line_count

Subject: [PATCH] t1410: use test_line_count

## tl;dr

2 messages between Nov 26, 2019 and Nov 26, 2019. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

René Scharfe· Nov 26, 2019, 18:21 UTC · lore

Use test_line_count to check if the number of lines matches expectations, for improved consistency and nicer debug output.

Signed-off-by: René Scharfe <l.s.r@web.de>
---
 t/t1410-reflog.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to t/t1410-reflog.sh +2 −3

diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 82950c0282..76d9b744a6 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -195,7 +195,7 @@ test_expect_success 'delete' '

 	git reflog delete master@{1} &&
 	git reflog show master > output &&
-	test $(($master_entry_count - 1)) = $(wc -l < output) &&
+	test_line_count = $(($master_entry_count - 1)) output &&
 	test $HEAD_entry_count = $(git reflog | wc -l) &&
 	! grep ox < output &&

@@ -209,7 +209,7 @@ test_expect_success 'delete' '

 	git reflog delete master@{07.04.2005.15:15:00.-0700} &&
 	git reflog show master > output &&
-	test $(($master_entry_count - 1)) = $(wc -l < output) &&
+	test_line_count = $(($master_entry_count - 1)) output &&
 	! grep dragon < output

 '
--
2.24.0

Johannes Schindelin· Nov 26, 2019, 22:15 UTC · re: René Scharfe · lore

Re: [PATCH] t1410: use test_line_count

Hi René,

On Tue, 26 Nov 2019, René Scharfe wrote:

> Use test_line_count to check if the number of lines matches
> expectations, for improved consistency and nicer debug output.
>
> Signed-off-by: René Scharfe <l.s.r@web.de>

ACK!

Thanks, Dscho

Show 29 quoted lines

> ---
>  t/t1410-reflog.sh | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
> index 82950c0282..76d9b744a6 100755
> --- a/t/t1410-reflog.sh
> +++ b/t/t1410-reflog.sh
> @@ -195,7 +195,7 @@ test_expect_success 'delete' '
>
>  	git reflog delete master@{1} &&
>  	git reflog show master > output &&
> -	test $(($master_entry_count - 1)) = $(wc -l < output) &&
> +	test_line_count = $(($master_entry_count - 1)) output &&
>  	test $HEAD_entry_count = $(git reflog | wc -l) &&
>  	! grep ox < output &&
>
> @@ -209,7 +209,7 @@ test_expect_success 'delete' '
>
>  	git reflog delete master@{07.04.2005.15:15:00.-0700} &&
>  	git reflog show master > output &&
> -	test $(($master_entry_count - 1)) = $(wc -l < output) &&
> +	test_line_count = $(($master_entry_count - 1)) output &&
>  	! grep dragon < output
>
>  '
> --
> 2.24.0
>