[PATCH 6/6] t4012: Make --shortstat more robust

[PATCH 6/6] t4012: Make --shortstat more robust

[Alexander Strasser]

The --shortstat test depends on the same scenario as the
--stat test. Use the part of the same expected result for
the --stat test to avoid duplicating it manually.

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
---
 t/t4012-diff-binary.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 81a9e8c..a3f6030 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -38,9 +38,9 @@ test_expect_success 'apply --stat output for binary file change' '
 '
 
 test_expect_success 'diff --shortstat output for binary file change' '
-	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected &&
+	tail -1 expected >expect &&
 	git diff --shortstat >current &&
-	test_i18ncmp expected current
+	test_i18ncmp expect current
 '
 
 test_expect_success 'diff --shortstat output for binary file change only' '
-- 
1.7.10.2.552.gaa3bb87

Re: [PATCH 6/6] t4012: Make --shortstat more robust

[Junio C Hamano]

Alexander Strasser <eclipse7@gmx.net> writes:

> The --shortstat test depends on the same scenario as the --stat
> test. Use the part of the same expected result for the --stat test
> to avoid duplicating it manually.

> diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
> index 81a9e8c..a3f6030 100755
> --- a/t/t4012-diff-binary.sh
> +++ b/t/t4012-diff-binary.sh
> @@ -38,9 +38,9 @@ test_expect_success 'apply --stat output for binary file change' '
>  '
>  
>  test_expect_success 'diff --shortstat output for binary file change' '
> -	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected &&
> +	tail -1 expected >expect &&

"(tail|head) -n 1" is preferred.  There are the same POSIX.1
violations in a handful of other scripts, 5526, 7502, 7800 and
9146.

>  	git diff --shortstat >current &&
> -	test_i18ncmp expected current
> +	test_i18ncmp expect current
>  '
>  
>  test_expect_success 'diff --shortstat output for binary file change only' '

Other than that, the series looked good.  Thanks.

Re: [PATCH 6/6] t4012: Make --shortstat more robust

[Alexander Strasser]

Hi,

  seems I managed to omit a word in the short log message:
  t4012: Make --shortstat *test* more robust

Junio C Hamano wrote:
> Alexander Strasser <eclipse7@gmx.net> writes:
> 
> > The --shortstat test depends on the same scenario as the --stat
> > test. Use the part of the same expected result for the --stat test
> > to avoid duplicating it manually.
> 
> > diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
> > index 81a9e8c..a3f6030 100755
> > --- a/t/t4012-diff-binary.sh
> > +++ b/t/t4012-diff-binary.sh
> > @@ -38,9 +38,9 @@ test_expect_success 'apply --stat output for binary file change' '
> >  '
> >  
> >  test_expect_success 'diff --shortstat output for binary file change' '
> > -	echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected &&
> > +	tail -1 expected >expect &&
> 
> "(tail|head) -n 1" is preferred.  There are the same POSIX.1
> violations in a handful of other scripts, 5526, 7502, 7800 and
> 9146.

  OK, got it.

> >  	git diff --shortstat >current &&
> > -	test_i18ncmp expected current
> > +	test_i18ncmp expect current
> >  '
> >  
> >  test_expect_success 'diff --shortstat output for binary file change only' '
> 
> Other than that, the series looked good.  Thanks.

  I will wait a bit longer for comments and then resend a corrected
version. Thanks for the quick reply.

  Alexander