Mercurial > hg
view tests/test-push-checkheads-pruned-B1.t @ 32980:8dc62c97a665
run-tests: do not prompt changes (-i) if a race condition is detected
The race condition is like:
1. run-tests.py reads test-a.t as reference output, content A
2. run-tests.py runs the test (which could be content B, another race
condition fixed by the next patch, but assume it's content A here)
3. something changes test-a.t to content C
4. run-tests.py compares test output (content D) with content A
5. with "-i", run-tests.py prompts diff(A, D), while the file has content
C instead of A at this time
This patch detects the above case and tell the user to rerun the test if
they want to apply test changes.
author | Jun Wu <quark@fb.com> |
---|---|
date | Wed, 21 Jun 2017 01:05:20 -0700 |
parents | c6cb21ddf74a |
children | 53b3a1968aa6 |
line wrap: on
line source
==================================== Testing head checking code: Case B-1 ==================================== Mercurial checks for the introduction of new heads on push. Evolution comes into play to detect if existing branches on the server are being replaced by some of the new one we push. This case is part of a series of tests checking this behavior. Category B: simple case involving pruned changesets TestCase 1: single pruned changeset .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * old branch is pruned .. * 1 new unrelated branch .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. ◔ B .. | .. A ⊗ | .. |/ .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir B1 $ cd B1 $ setuprepos creating basic server and client repo updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd client $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B0 created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` $ hg log -G --hidden @ 74ff5441d343 (draft): B0 | | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/B1/server (glob) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers $ cd ../..