Re: [PATCH 2/2] send-email: add test for duplicate utf8 name

From: SZEDER Gábor <szeder@ira.uka.de>
Date: Jun 18, 2013, 13:55 UTC
Message-ID: <20130618135524.GC20052@goldbirke>
In-Reply-To: <1371559723-28059-2-git-send-email-mst@redhat.com>

Hi Michael,

thanks for the quick turnaround.

On Tue, Jun 18, 2013 at 03:49:29PM +0300, Michael S. Tsirkin wrote:

Show 27 quoted lines

> Verify that author name is not duplicated if it matches
> sender, even if it is in utf8.
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  t/t9001-send-email.sh | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
> index 9f46f22..cef884f 100755
> --- a/t/t9001-send-email.sh
> +++ b/t/t9001-send-email.sh
> @@ -956,6 +956,19 @@ test_expect_success $PREREQ 'utf8 author is correctly passed on' '
>  	grep "^From: Füñný Nâmé <odd_?=mail@example.com>" msgtxt1
>  '
>  
> +test_expect_success $PREREQ 'utf8 sender is not duplicated' '
> +	clean_fake_sendmail &&
> +	test_commit weird_sender &&
> +	test_when_finished "git reset --hard HEAD^" &&
> +	git commit --amend --author "Füñný Nâmé <odd_?=mail@example.com>" &&
> +	git format-patch --stdout -1 >funny_name.patch &&
> +	git send-email --from="Füñný Nâmé <odd_?=mail@example.com>" \
> +	  --to=nobody@example.com \
> +	  --smtp-server="$(pwd)/fake.sendmail" \
> +	  funny_name.patch &&
> +	test `grep "^From:" msgtxt1|wc -l` -eq 1

Perhaps you could use here

  grep "^From:" msgtxt1 >from &&
  test_line_count = 1 from

instead, to make it more debugging-friendly.

Show 7 quoted lines

> +'
> +
>  test_expect_success $PREREQ 'sendemail.composeencoding works' '
>  	clean_fake_sendmail &&
>  	git config sendemail.composeencoding iso-8859-1 &&
> -- 
> MST

I couldn't apply this patch with git am/apply on top of today's master for some reason, although the context lines seem to match exactly... in the end had to apply it manually.

Anyway, 1/2 fixes my problem, so:

Tested-by: SZEDER Gábor <szeder@ira.uka.de>

Thanks, Gábor