Mercurial > hg
diff tests/test-merge-commit.t @ 17132:b87acfda5268
tests: reduce spurious failures when run with generaldelta
Quite a few tests fail in noisy but meaningless ways when the test suite
is run with generaldelta enabled:
./run-tests.py --extra-config-opt=format.generaldelta=1
This reduces the amount of noise introduced by the debugindex command,
the main source of differences. In my environment, when testing with
generaldelta enabled, this change reduces the number of completely
failing tests from 21 to 8.
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Wed, 11 Jul 2012 15:03:10 -0700 |
| parents | f2719b387380 |
| children | 5ed6a375e9ca |
line wrap: on
line diff
--- a/tests/test-merge-commit.t Wed Jul 04 17:29:49 2012 +0200 +++ b/tests/test-merge-commit.t Wed Jul 11 15:03:10 2012 -0700 @@ -35,17 +35,17 @@ $ hg ci -m '3: merge with local rename' $ hg debugindex bar - rev offset length base linkrev nodeid p1 p2 - 0 0 77 0 2 d35118874825 000000000000 000000000000 - 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - rev offset length base linkrev nodeid p1 p2 - 0 0 7 0 0 690b295714ae 000000000000 000000000000 - 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) + 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) Revert the content change from rev 2: @@ -88,11 +88,11 @@ $ hg ci -m '5: merge' $ hg debugindex bar - rev offset length base linkrev nodeid p1 p2 - 0 0 77 0 2 d35118874825 000000000000 000000000000 - 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 - 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 - 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) + 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) + 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) Same thing, but with the merge on 3 having the rename @@ -122,17 +122,17 @@ $ hg ci -m '3: merge with remote rename' $ hg debugindex bar - rev offset length base linkrev nodeid p1 p2 - 0 0 77 0 2 d35118874825 000000000000 000000000000 - 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) $ hg debugrename bar bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2 $ hg debugindex foo - rev offset length base linkrev nodeid p1 p2 - 0 0 7 0 0 690b295714ae 000000000000 000000000000 - 1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000 + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 7 ..... 0 690b295714ae 000000000000 000000000000 (re) + 1 7 13 ..... 1 9e25c27b8757 690b295714ae 000000000000 (re) Revert the content change from rev 2: @@ -175,10 +175,10 @@ $ hg ci -m '5: merge' $ hg debugindex bar - rev offset length base linkrev nodeid p1 p2 - 0 0 77 0 2 d35118874825 000000000000 000000000000 - 1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825 - 2 153 7 2 4 ff4b45017382 d35118874825 000000000000 - 3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd + rev offset length ..... linkrev nodeid p1 p2 (re) + 0 0 77 ..... 2 d35118874825 000000000000 000000000000 (re) + 1 77 76 ..... 3 5345f5ab8abd 000000000000 d35118874825 (re) + 2 153 7 ..... 4 ff4b45017382 d35118874825 000000000000 (re) + 3 160 13 ..... 5 3701b4893544 ff4b45017382 5345f5ab8abd (re) $ cd ..