Patchwork [3,of,4] tests: remove glob from output lines containing no glob character

login
register
mail settings
Submitter Simon Heimberg
Date Feb. 12, 2013, 11:05 p.m.
Message ID <a36b0c19bec9b4d43ab2.1360710332@lapsi.heimberg.home>
Download mbox | patch
Permalink /patch/969/
State Accepted
Commit 408f2202bd806128f58a0632b440f3d465123dad
Headers show

Comments

Simon Heimberg - Feb. 12, 2013, 11:05 p.m.
# HG changeset patch
# User Simon Heimberg <simohe@besonet.ch>
# Date 1350336748 -7200
# Node ID a36b0c19bec9b4d43ab250b091fbddb614d75374
# Parent  282ccb8b49295d2fafb987ca1d7a1e609c18f3fa
tests: remove glob from output lines containing no glob character
tonfa - Feb. 12, 2013, 11:21 p.m.
On Wed, Feb 13, 2013 at 12:05 AM, Simon Heimberg <simohe@besonet.ch> wrote:

> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1350336748 -7200
> # Node ID a36b0c19bec9b4d43ab250b091fbddb614d75374
> # Parent  282ccb8b49295d2fafb987ca1d7a1e609c18f3fa
> tests: remove glob from output lines containing no glob character
>

Message is a bit misleading (the first hunk doesn't remove (glob)).

>
> diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-https.t
> --- a/tests/test-https.t        Mon Okt 15 23:28:45 2012 +0200
> +++ b/tests/test-https.t        Mon Okt 15 23:32:28 2012 +0200
> @@ -106,7 +106,7 @@
>
>  #if windows
>    $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
> -  abort: cannot start server at ':$HGPORT': (glob)
> +  abort: cannot start server at ':$HGPORT':* (glob)
>    [255]
>  #else
>    $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
> diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-walk.t
> --- a/tests/test-walk.t Mon Okt 15 23:28:45 2012 +0200
> +++ b/tests/test-walk.t Mon Okt 15 23:32:28 2012 +0200
> @@ -155,7 +155,7 @@
>    abort: path 'mammals/.hg' is inside nested repo 'mammals' (glob)
>    [255]
>    $ hg debugwalk ../.hg
> -  abort: path contains illegal component: .hg (glob)
> +  abort: path contains illegal component: .hg
>    [255]
>    $ cd ..
>
> @@ -187,10 +187,10 @@
>    abort: beans/../.. not under root '$TESTTMP/t' (glob)
>    [255]
>    $ hg debugwalk .hg
> -  abort: path contains illegal component: .hg (glob)
> +  abort: path contains illegal component: .hg
>    [255]
>    $ hg debugwalk beans/../.hg
> -  abort: path contains illegal component: .hg (glob)
> +  abort: path contains illegal component: .hg
>    [255]
>    $ hg debugwalk beans/../.hg/data
>    abort: path contains illegal component: .hg/data (glob)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
>
Simon Heimberg - Feb. 13, 2013, 9:12 a.m.
Maybe the message is right but the first hunk is wrong. Not sure anymore why
I did it this way.

The change (in the first hunk) is:
>  #if windows
>    $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
> -  abort: cannot start server at ':$HGPORT': (glob)
> +  abort: cannot start server at ':$HGPORT':* (glob)
>    [255]
>  #else
Not sure if really the asterisk is missing here. Probably we can just remove
"(glob)". If not the test would have fallen all the time (on windows).
Could somebody check this please?

Greetings,
Simon

On Wed, 13 Feb 2013 at 00:21 Benoit Boissinot <bboissin@gmail.com> wrote:
> On Wed, Feb 13, 2013 at 12:05 AM, Simon Heimberg <simohe@besonet.ch>
wrote:
> # HG changeset patch
> # User Simon Heimberg <simohe@besonet.ch>
> # Date 1350336748 -7200
> # Node ID a36b0c19bec9b4d43ab250b091fbddb614d75374
> # Parent  282ccb8b49295d2fafb987ca1d7a1e609c18f3fa
> tests: remove glob from output lines containing no glob character
>
> Message is a bit misleading (the first hunk doesn't remove (glob)). 

>
>> diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-https.t
>> --- a/tests/test-https.t        Mon Okt 15 23:28:45 2012 +0200
>> +++ b/tests/test-https.t        Mon Okt 15 23:32:28 2012 +0200
>> @@ -106,7 +106,7 @@
>>
>>  #if windows
>>    $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
>> -  abort: cannot start server at ':$HGPORT': (glob)
>> +  abort: cannot start server at ':$HGPORT':* (glob)
>>    [255]
>>  #else
>>    $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
>> diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-walk.t
>> --- a/tests/test-walk.t Mon Okt 15 23:28:45 2012 +0200
>> +++ b/tests/test-walk.t Mon Okt 15 23:32:28 2012 +0200
>> @@ -155,7 +155,7 @@
>>    abort: path 'mammals/.hg' is inside nested repo 'mammals' (glob)
>>    [255]
>>    $ hg debugwalk ../.hg
>> -  abort: path contains illegal component: .hg (glob)
>> +  abort: path contains illegal component: .hg
>>    [255]
>>    $ cd ..
>> 
>> @@ -187,10 +187,10 @@
>>   abort: beans/../.. not under root '$TESTTMP/t' (glob)
>>   [255]
>>   $ hg debugwalk .hg
>> -  abort: path contains illegal component: .hg (glob)
>> +  abort: path contains illegal component: .hg
>>   [255]
>>   $ hg debugwalk beans/../.hg
>> -  abort: path contains illegal component: .hg (glob)
>> +  abort: path contains illegal component: .hg
>>   [255]
>>   $ hg debugwalk beans/../.hg/data
>>   abort: path contains illegal component: .hg/data (glob)
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel@selenic.com
>> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-https.t
--- a/tests/test-https.t	Mon Okt 15 23:28:45 2012 +0200
+++ b/tests/test-https.t	Mon Okt 15 23:32:28 2012 +0200
@@ -106,7 +106,7 @@ 
 
 #if windows
   $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
-  abort: cannot start server at ':$HGPORT': (glob)
+  abort: cannot start server at ':$HGPORT':* (glob)
   [255]
 #else
   $ hg serve -p $HGPORT --certificate=$PRIV 2>&1
diff -r 282ccb8b4929 -r a36b0c19bec9 tests/test-walk.t
--- a/tests/test-walk.t	Mon Okt 15 23:28:45 2012 +0200
+++ b/tests/test-walk.t	Mon Okt 15 23:32:28 2012 +0200
@@ -155,7 +155,7 @@ 
   abort: path 'mammals/.hg' is inside nested repo 'mammals' (glob)
   [255]
   $ hg debugwalk ../.hg
-  abort: path contains illegal component: .hg (glob)
+  abort: path contains illegal component: .hg
   [255]
   $ cd ..
 
@@ -187,10 +187,10 @@ 
   abort: beans/../.. not under root '$TESTTMP/t' (glob)
   [255]
   $ hg debugwalk .hg
-  abort: path contains illegal component: .hg (glob)
+  abort: path contains illegal component: .hg
   [255]
   $ hg debugwalk beans/../.hg
-  abort: path contains illegal component: .hg (glob)
+  abort: path contains illegal component: .hg
   [255]
   $ hg debugwalk beans/../.hg/data
   abort: path contains illegal component: .hg/data (glob)