Mercurial > hg-stable
changeset 18601:ce844e8e8af2
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.
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Sat, 09 Feb 2013 13:35:45 +0000 |
| parents | 8ba520003ae0 |
| children | 339a3fa19695 |
| files | tests/test-check-code-hg.t |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-check-code-hg.t Sat Feb 09 15:08:21 2013 +0000 +++ b/tests/test-check-code-hg.t Sat Feb 09 13:35:45 2013 +0000 @@ -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