Patchwork [1,of,2] tests: guard against obsolete markers in the hg repo itself

login
register
mail settings
Submitter Kevin Bullock
Date Feb. 9, 2013, 2:27 p.m.
Message ID <1cb04715fd4bb12bc5f3.1360420036@s0-0.paconsult7.bbnplanet.net>
Download mbox | patch
Permalink /patch/877/
State Accepted
Commit ce844e8e8af253b277e2151f0cc7c38f7c5abc30
Headers show

Comments

Kevin Bullock - Feb. 9, 2013, 2:27 p.m.
# HG changeset patch
# User Kevin Bullock <kbullock@ringworld.org>
# Date 1360416945 0
# Node ID 1cb04715fd4bb12bc5f3fd52a6b055201e704059
# Parent  d8cfe29c6b612fe6e250afdd7219eb4d461b9e3e
tests: guard against obsolete markers in the hg repo itself

If obsolete markers appear in the hg repo (because of enabling evolve),
then tests that run hg against the hg repo itself will see warnings like:

  obsolete feature not enabled but 4 markers found!

As far as I can tell, this only occurs in test-check-code-hg.t -- in
particular, it will -not- show up on tests that run against test-created
repos, as most of the test suite does.
Augie Fackler - Feb. 9, 2013, 2:28 p.m.
This one LG as well, push 'em.

On Feb 9, 2013, at 2:27 PM, Kevin Bullock <kbullock+mercurial@ringworld.org> wrote:

> # HG changeset patch
> # User Kevin Bullock <kbullock@ringworld.org>
> # Date 1360416945 0
> # Node ID 1cb04715fd4bb12bc5f3fd52a6b055201e704059
> # Parent  d8cfe29c6b612fe6e250afdd7219eb4d461b9e3e
> tests: guard against obsolete markers in the hg repo itself
> 
> If obsolete markers appear in the hg repo (because of enabling evolve),
> then tests that run hg against the hg repo itself will see warnings like:
> 
>  obsolete feature not enabled but 4 markers found!
> 
> As far as I can tell, this only occurs in test-check-code-hg.t -- in
> particular, it will -not- show up on tests that run against test-created
> repos, as most of the test suite does.
> 
> diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
> --- a/tests/test-check-code-hg.t
> +++ b/tests/test-check-code-hg.t
> @@ -1,6 +1,6 @@
>   $ check_code="$TESTDIR"/../contrib/check-code.py
>   $ cd "$TESTDIR"/..
> -  $ if hg identify -q > /dev/null; then :
> +  $ if hg identify -q > /dev/null 2>&1; then :
>> else
>>    echo "skipped: not a Mercurial working dir" >&2
>>    exit 80
> @@ -8,8 +8,9 @@
> 
> New errors are not allowed. Warnings are strongly discouraged.
> 
> -  $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 \
> -  > || false
> +  $ hg manifest 2>/dev/null \
> +  >   | xargs "$check_code" --warnings --nolineno --per-file=0 \
> +  >   || false
>   tests/test-serve.t:0:
>>>       kill `cat hg.pid`
>    don't use kill, use killdaemons.py

Patch

diff --git a/tests/test-check-code-hg.t b/tests/test-check-code-hg.t
--- a/tests/test-check-code-hg.t
+++ b/tests/test-check-code-hg.t
@@ -1,6 +1,6 @@ 
   $ check_code="$TESTDIR"/../contrib/check-code.py
   $ cd "$TESTDIR"/..
-  $ if hg identify -q > /dev/null; then :
+  $ if hg identify -q > /dev/null 2>&1; then :
   > else
   >     echo "skipped: not a Mercurial working dir" >&2
   >     exit 80
@@ -8,8 +8,9 @@ 
 
 New errors are not allowed. Warnings are strongly discouraged.
 
-  $ hg manifest | xargs "$check_code" --warnings --nolineno --per-file=0 \
-  > || false
+  $ hg manifest 2>/dev/null \
+  >   | xargs "$check_code" --warnings --nolineno --per-file=0 \
+  >   || false
   tests/test-serve.t:0:
    >   >        kill `cat hg.pid`
    don't use kill, use killdaemons.py