Patchwork [1,of,3,stable] tests: deal with new gits sending status messages to stderr

login
register
mail settings
Submitter Mads Kiilerich
Date Nov. 17, 2013, 12:57 a.m.
Message ID <969c649f5fdf7b0a8f06.1384649851@localhost.localdomain>
Download mbox | patch
Permalink /patch/3002/
State Accepted
Commit c5a0f899e47b117f20abe2cf57edda0f83f3fdbf
Headers show

Comments

Mads Kiilerich - Nov. 17, 2013, 12:57 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1384649738 18000
#      Sat Nov 16 19:55:38 2013 -0500
# Branch stable
# Node ID 969c649f5fdf7b0a8f066456432ee401511f5255
# Parent  cb466830826a5fb0eecd4428922c2618d6a1b8af
tests: deal with new gits sending status messages to stderr

git-1.8.4.2 will send messages like
  Cloning into 'X'...
  done.
to stderr.

Mute stderr.
Augie Fackler - Nov. 17, 2013, 10:44 p.m.
On Sat, Nov 16, 2013 at 07:57:31PM -0500, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1384649738 18000
> #      Sat Nov 16 19:55:38 2013 -0500
> # Branch stable
> # Node ID 969c649f5fdf7b0a8f066456432ee401511f5255
> # Parent  cb466830826a5fb0eecd4428922c2618d6a1b8af
> tests: deal with new gits sending status messages to stderr
>
> git-1.8.4.2 will send messages like
>   Cloning into 'X'...
>   done.
> to stderr.
>
> Mute stderr.
>
> diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
> --- a/tests/test-subrepo-git.t
> +++ b/tests/test-subrepo-git.t
> @@ -71,7 +71,7 @@ make $GITROOT pushable, by replacing it
>  clone root
>
>    $ cd t
> -  $ hg clone . ../tc
> +  $ hg clone . ../tc 2> /dev/null
>    updating to branch default
>    cloning subrepo s from $TESTTMP/gitroot
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -94,7 +94,7 @@ update to previous substate
>  clone root, make local change
>
>    $ cd ../t
> -  $ hg clone . ../ta
> +  $ hg clone . ../ta 2> /dev/null

sending hg clone to stderr? perl pie gone wrong?

>    updating to branch default
>    cloning subrepo s from $TESTTMP/gitroot
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -113,7 +113,7 @@ clone root, make local change
>  clone root separately, make different local change
>
>    $ cd ../t
> -  $ hg clone . ../tb
> +  $ hg clone . ../tb 2> /dev/null
>    updating to branch default
>    cloning subrepo s from $TESTTMP/gitroot
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -199,7 +199,7 @@ make upstream git changes
>  make and push changes to hg without updating the subrepo
>
>    $ cd ../t
> -  $ hg clone . ../td
> +  $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.'
>    updating to branch default
>    cloning subrepo s from $TESTTMP/gitroot
>    checking out detached HEAD in subrepo s
> @@ -317,7 +317,7 @@ create nested repo
>    $ hg add b
>    $ hg commit -m b
>
> -  $ hg clone ../t inner
> +  $ hg clone ../t inner 2> /dev/null
>    updating to branch default
>    cloning subrepo s from $TESTTMP/gitroot
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -345,7 +345,7 @@ relative source expansion
>
>    $ cd ..
>    $ mkdir d
> -  $ hg clone t d/t
> +  $ hg clone t d/t 2> /dev/null
>    updating to branch default
>    cloning subrepo s from $TESTTMP/gitroot
>    3 files updated, 0 files merged, 0 files removed, 0 files unresolved
> @@ -364,7 +364,7 @@ Don't crash if the subrepo is missing
>    $ hg commit --subrepos -qm missing
>    abort: subrepo s is missing (in subrepo s)
>    [255]
> -  $ hg update -C
> +  $ hg update -C 2> /dev/null
>    cloning subrepo s from $TESTTMP/gitroot
>    1 files updated, 0 files merged, 0 files removed, 0 files unresolved
>    $ hg sum | grep commit
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel
Mads Kiilerich - Nov. 17, 2013, 10:51 p.m.
On 11/17/2013 05:44 PM, Augie Fackler wrote:
> On Sat, Nov 16, 2013 at 07:57:31PM -0500, Mads Kiilerich wrote:
>> # HG changeset patch
>> # User Mads Kiilerich <madski@unity3d.com>
>> # Date 1384649738 18000
>> #      Sat Nov 16 19:55:38 2013 -0500
>> # Branch stable
>> # Node ID 969c649f5fdf7b0a8f066456432ee401511f5255
>> # Parent  cb466830826a5fb0eecd4428922c2618d6a1b8af
>> tests: deal with new gits sending status messages to stderr
>>
>> git-1.8.4.2 will send messages like
>>    Cloning into 'X'...
>>    done.
>> to stderr.
>>
>> Mute stderr.
>>
>> diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
>> --- a/tests/test-subrepo-git.t
>> +++ b/tests/test-subrepo-git.t
>> @@ -71,7 +71,7 @@ make $GITROOT pushable, by replacing it
>>   clone root
>>
>>     $ cd t
>> -  $ hg clone . ../tc
>> +  $ hg clone . ../tc 2> /dev/null
>>     updating to branch default
>>     cloning subrepo s from $TESTTMP/gitroot
>>     3 files updated, 0 files merged, 0 files removed, 0 files unresolved
>> @@ -94,7 +94,7 @@ update to previous substate
>>   clone root, make local change
>>
>>     $ cd ../t
>> -  $ hg clone . ../ta
>> +  $ hg clone . ../ta 2> /dev/null
> sending hg clone to stderr? perl pie gone wrong?

No. Subrepos gone wrong.

/Mads
Matt Mackall - Nov. 25, 2013, 10:01 p.m.
On Sat, 2013-11-16 at 19:57 -0500, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1384649738 18000
> #      Sat Nov 16 19:55:38 2013 -0500
> # Branch stable
> # Node ID 969c649f5fdf7b0a8f066456432ee401511f5255
> # Parent  cb466830826a5fb0eecd4428922c2618d6a1b8af
> tests: deal with new gits sending status messages to stderr

This is queued for stable, thanks.

Patch

diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -71,7 +71,7 @@  make $GITROOT pushable, by replacing it 
 clone root
 
   $ cd t
-  $ hg clone . ../tc
+  $ hg clone . ../tc 2> /dev/null
   updating to branch default
   cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -94,7 +94,7 @@  update to previous substate
 clone root, make local change
 
   $ cd ../t
-  $ hg clone . ../ta
+  $ hg clone . ../ta 2> /dev/null
   updating to branch default
   cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -113,7 +113,7 @@  clone root, make local change
 clone root separately, make different local change
 
   $ cd ../t
-  $ hg clone . ../tb
+  $ hg clone . ../tb 2> /dev/null
   updating to branch default
   cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -199,7 +199,7 @@  make upstream git changes
 make and push changes to hg without updating the subrepo
 
   $ cd ../t
-  $ hg clone . ../td
+  $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.'
   updating to branch default
   cloning subrepo s from $TESTTMP/gitroot
   checking out detached HEAD in subrepo s
@@ -317,7 +317,7 @@  create nested repo
   $ hg add b
   $ hg commit -m b
 
-  $ hg clone ../t inner
+  $ hg clone ../t inner 2> /dev/null
   updating to branch default
   cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -345,7 +345,7 @@  relative source expansion
 
   $ cd ..
   $ mkdir d
-  $ hg clone t d/t
+  $ hg clone t d/t 2> /dev/null
   updating to branch default
   cloning subrepo s from $TESTTMP/gitroot
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -364,7 +364,7 @@  Don't crash if the subrepo is missing
   $ hg commit --subrepos -qm missing
   abort: subrepo s is missing (in subrepo s)
   [255]
-  $ hg update -C
+  $ hg update -C 2> /dev/null
   cloning subrepo s from $TESTTMP/gitroot
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg sum | grep commit