Patchwork [STABLE] Tests: fix test on windows by appending glob to lines returning "\" in the path

login
register
mail settings
Submitter Simon Heimberg
Date Feb. 13, 2013, 11:43 a.m.
Message ID <000001ce09df$4f4e1f80$edea5e80$@besonet.ch>
Download mbox | patch
Permalink /patch/977/
State Accepted, archived
Headers show

Comments

Simon Heimberg - Feb. 13, 2013, 11:43 a.m.
# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1360755357 -3600
# Node ID a9b334ae174bff56afe1c9fb060cf940d04295e7
# Parent  013fcd112f13f31a35ea6a40d8cd1c6923cdaf20
Tests: fix test on windows by appending glob to lines returning "\" in the
path

This lines were introduced in cd403d6d96ef and made the test fail on
windows.
tonfa - Feb. 13, 2013, 8:30 p.m.
Crewed, thanks.


On Wed, Feb 13, 2013 at 12:43 PM, Simon Heimberg <simohe@besonet.ch> wrote:

> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1360755357 -3600
> # Node ID a9b334ae174bff56afe1c9fb060cf940d04295e7
> # Parent  013fcd112f13f31a35ea6a40d8cd1c6923cdaf20
> Tests: fix test on windows by appending glob to lines returning "\" in the
> path
>
> This lines were introduced in cd403d6d96ef and made the test fail on
> windows.
>
> diff -r 013fcd112f13 -r a9b334ae174b tests/test-obsolete.t
> --- a/tests/test-obsolete.t     Sat Feb 09 11:00:42 2013 +0100
> +++ b/tests/test-obsolete.t     Wed Feb 13 12:35:57 2013 +0100
> @@ -816,7 +816,7 @@
>       summary:     A
>
>    $ hg incoming
> -  comparing with $TESTTMP/tmpe/repo-issue3805
> +  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
>    searching for changes
>    changeset:   2:3816541e5485
>    tag:         tip
> @@ -826,7 +826,7 @@
>    summary:     A
>
>    $ hg incoming --bundle ../issue3805.hg
> -  comparing with $TESTTMP/tmpe/repo-issue3805
> +  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
>    searching for changes
>    changeset:   2:3816541e5485
>    tag:         tip
> @@ -836,7 +836,7 @@
>    summary:     A
>
>    $ hg outgoing
> -  comparing with $TESTTMP/tmpe/repo-issue3805
> +  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
>    searching for changes
>    no changes found
>    [1]
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
tonfa - Feb. 13, 2013, 8:34 p.m.
Side note: I fixed the patch description.

You might find
http://mercurial.selenic.com/wiki/ContributingChanges#Patch_descriptionshelpful
to learn about our preferred formatting.

Cheers,

Benoit


On Wed, Feb 13, 2013 at 9:30 PM, Benoit Boissinot <bboissin@gmail.com>wrote:

> Crewed, thanks.
>
>
> On Wed, Feb 13, 2013 at 12:43 PM, Simon Heimberg <simohe@besonet.ch>wrote:
>
>> # HG changeset patch
>> # User Simon Heimberg <simohe@besonet.ch>
>> # Date 1360755357 -3600
>> # Node ID a9b334ae174bff56afe1c9fb060cf940d04295e7
>> # Parent  013fcd112f13f31a35ea6a40d8cd1c6923cdaf20
>> Tests: fix test on windows by appending glob to lines returning "\" in the
>> path
>>
>> This lines were introduced in cd403d6d96ef and made the test fail on
>> windows.
>>
>> diff -r 013fcd112f13 -r a9b334ae174b tests/test-obsolete.t
>> --- a/tests/test-obsolete.t     Sat Feb 09 11:00:42 2013 +0100
>> +++ b/tests/test-obsolete.t     Wed Feb 13 12:35:57 2013 +0100
>> @@ -816,7 +816,7 @@
>>       summary:     A
>>
>>    $ hg incoming
>> -  comparing with $TESTTMP/tmpe/repo-issue3805
>> +  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
>>    searching for changes
>>    changeset:   2:3816541e5485
>>    tag:         tip
>> @@ -826,7 +826,7 @@
>>    summary:     A
>>
>>    $ hg incoming --bundle ../issue3805.hg
>> -  comparing with $TESTTMP/tmpe/repo-issue3805
>> +  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
>>    searching for changes
>>    changeset:   2:3816541e5485
>>    tag:         tip
>> @@ -836,7 +836,7 @@
>>    summary:     A
>>
>>    $ hg outgoing
>> -  comparing with $TESTTMP/tmpe/repo-issue3805
>> +  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
>>    searching for changes
>>    no changes found
>>    [1]
>>
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@selenic.com
>> http://selenic.com/mailman/listinfo/mercurial-devel
>>
>
>

Patch

diff -r 013fcd112f13 -r a9b334ae174b tests/test-obsolete.t
--- a/tests/test-obsolete.t	Sat Feb 09 11:00:42 2013 +0100
+++ b/tests/test-obsolete.t	Wed Feb 13 12:35:57 2013 +0100
@@ -816,7 +816,7 @@ 
      summary:     A
   
   $ hg incoming
-  comparing with $TESTTMP/tmpe/repo-issue3805
+  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
   searching for changes
   changeset:   2:3816541e5485
   tag:         tip
@@ -826,7 +826,7 @@ 
   summary:     A
   
   $ hg incoming --bundle ../issue3805.hg
-  comparing with $TESTTMP/tmpe/repo-issue3805
+  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
   searching for changes
   changeset:   2:3816541e5485
   tag:         tip
@@ -836,7 +836,7 @@ 
   summary:     A
   
   $ hg outgoing
-  comparing with $TESTTMP/tmpe/repo-issue3805
+  comparing with $TESTTMP/tmpe/repo-issue3805 (glob)
   searching for changes
   no changes found
   [1]