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

2013-06-20 Thread Michael S. Tsirkin
Verify that author name is not duplicated if it matches
sender, even if it is in utf8.

Signed-off-by: Michael S. Tsirkin 
---
 t/t9001-send-email.sh | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 9f46f22..020acc4 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -956,6 +956,20 @@ test_expect_success $PREREQ 'utf8 author is correctly 
passed on' '
grep "^From: Füñný Nâmé " 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é " &&
+   git format-patch --stdout -1 >funny_name.patch &&
+   git send-email --from="Füñný Nâmé " \
+ --to=nob...@example.com \
+ --smtp-server="$(pwd)/fake.sendmail" \
+ funny_name.patch &&
+   grep "^From:" msgtxt1 > msgfrom &&
+   test_line_count = 1 msgfrom
+'
+
 test_expect_success $PREREQ 'sendemail.composeencoding works' '
clean_fake_sendmail &&
git config sendemail.composeencoding iso-8859-1 &&
-- 
MST

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2013-06-20 Thread Thomas Rast
"Michael S. Tsirkin"  writes:

> Verify that author name is not duplicated if it matches
> sender, even if it is in utf8.

Small nit: if you make two patches out of it, add the tests first with
test_expect_failure.  Then flip it to test_expect_success in the actual
code change.  That makes it easy to verify that the test actually checks
the right thing, and that it was your code change that fixed it.

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2013-06-20 Thread Michael S. Tsirkin
On Thu, Jun 20, 2013 at 02:41:37PM +0200, Thomas Rast wrote:
> "Michael S. Tsirkin"  writes:
> 
> > Verify that author name is not duplicated if it matches
> > sender, even if it is in utf8.
> 
> Small nit: if you make two patches out of it, add the tests first with
> test_expect_failure.  Then flip it to test_expect_success in the actual
> code change.  That makes it easy to verify that the test actually checks
> the right thing, and that it was your code change that fixed it.

I did this by reverting 1/2 and rerunning.

But applying in reverse order means bisect can give us
a setup where some tests fail, I thought it's a
good idea to avoid that.

> -- 
> Thomas Rast
> trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2013-06-20 Thread Thomas Rast
"Michael S. Tsirkin"  writes:

> On Thu, Jun 20, 2013 at 02:41:37PM +0200, Thomas Rast wrote:
>> "Michael S. Tsirkin"  writes:
>> 
>> > Verify that author name is not duplicated if it matches
>> > sender, even if it is in utf8.
>> 
>> Small nit: if you make two patches out of it, add the tests first with
>> test_expect_failure.  Then flip it to test_expect_success in the actual
>> code change.  That makes it easy to verify that the test actually checks
>> the right thing, and that it was your code change that fixed it.
>
> I did this by reverting 1/2 and rerunning.
>
> But applying in reverse order means bisect can give us
> a setup where some tests fail, I thought it's a
> good idea to avoid that.

That's why you need to test_expect_*failure* in the commit that adds the
tests -- essentially saying "I know this is broken!".

Yes, it's a roundabout way.  But splitting code and tests in the way you
just posted is equally roundabout, while not having the benefit that one
can check out the commit at patch 1 and verify that it is indeed broken
(showing up as "still have known breakage").

-- 
Thomas Rast
trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2013-06-20 Thread Michael S. Tsirkin
On Thu, Jun 20, 2013 at 02:48:15PM +0200, Thomas Rast wrote:
> "Michael S. Tsirkin"  writes:
> 
> > On Thu, Jun 20, 2013 at 02:41:37PM +0200, Thomas Rast wrote:
> >> "Michael S. Tsirkin"  writes:
> >> 
> >> > Verify that author name is not duplicated if it matches
> >> > sender, even if it is in utf8.
> >> 
> >> Small nit: if you make two patches out of it, add the tests first with
> >> test_expect_failure.  Then flip it to test_expect_success in the actual
> >> code change.  That makes it easy to verify that the test actually checks
> >> the right thing, and that it was your code change that fixed it.
> >
> > I did this by reverting 1/2 and rerunning.
> >
> > But applying in reverse order means bisect can give us
> > a setup where some tests fail, I thought it's a
> > good idea to avoid that.
> 
> That's why you need to test_expect_*failure* in the commit that adds the
> tests -- essentially saying "I know this is broken!".
> 
> Yes, it's a roundabout way.  But splitting code and tests in the way you
> just posted is equally roundabout, while not having the benefit that one
> can check out the commit at patch 1 and verify that it is indeed broken
> (showing up as "still have known breakage").

I'll try to do it like this next time, I hope for now Junio
can take it as is.



> -- 
> Thomas Rast
> trast@{inf,student}.ethz.ch
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


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

2013-06-20 Thread Junio C Hamano
"Michael S. Tsirkin"  writes:

> Verify that author name is not duplicated if it matches
> sender, even if it is in utf8.
>
> Signed-off-by: Michael S. Tsirkin 
> ---

Hmph.  There seems to be something wrong in the original message I
received from you (look at Cc: line I have above, which was copied
by my MUA from the message I am responding to).

Visiting

  http://article.gmane.org/gmane.comp.version-control.git/228485/raw

shows this gem:

  Cc: =?us-ascii?B?PT9VVEYtOD9xP1NaRURFUj0yMEc9QzM9QTFib3I/PQ==?= 
 

Somebody is wrapping what "=?UTF-8?q?..." which you had already
wrapped into "=?us-ascii?B..."???

In any case, I think Thomas's "first expect failure and then flip
it, if you add test and fix as separate patches" is a good idea, and
the change between the previous one and this seems to be only the
last part of this test, so I'll tweak what I already have from the
previous on 'pu' locally and push the result out.  Please double
check the result.

Thanks.

>  t/t9001-send-email.sh | 14 ++
>  1 file changed, 14 insertions(+)
>
> diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
> index 9f46f22..020acc4 100755
> --- a/t/t9001-send-email.sh
> +++ b/t/t9001-send-email.sh
> @@ -956,6 +956,20 @@ test_expect_success $PREREQ 'utf8 author is correctly 
> passed on' '
>   grep "^From: Füñný Nâmé " 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é " &&
> + git format-patch --stdout -1 >funny_name.patch &&
> + git send-email --from="Füñný Nâmé " \
> +   --to=nob...@example.com \
> +   --smtp-server="$(pwd)/fake.sendmail" \
> +   funny_name.patch &&
> + grep "^From:" msgtxt1 > msgfrom &&
> + test_line_count = 1 msgfrom
> +'
> +
>  test_expect_success $PREREQ 'sendemail.composeencoding works' '
>   clean_fake_sendmail &&
>   git config sendemail.composeencoding iso-8859-1 &&
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html