tests/test-exchange-obsmarkers-case-C1.t
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 22 Jan 2018 14:10:59 +0530
branchstable
changeset 3452 8275ef099135
parent 3013 945a0989e41b
child 3106 a867d59ea97a
child 3559 d166b3dc5e8a
permissions -rw-r--r--
amend: query the wdir parent after taking lock (issue5266) If we query wdir parent without taking a lock, that can lead to bugs because the wdir parent can change is another process has changed the wdir parent. One such example of this was issue 5266. When a user is running amend and that amend is waiting for commit message, the user runs another amend which waits for lock. The second amend is waiting for lock, but has already read the description from the parent of working directory to use. Once the first amend completes the wdir parent changes but we still have the description from an old wdir parent. This patch fixes the bug by querying the description after taking lock. Attempts were made to add test for this but the results were unstable because they depend on time in which lock is released.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     1
============================================
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     2
Testing obsolescence markers push: Cases C.1
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     3
============================================
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     4
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     5
Mercurial pushes obsolescences markers relevant to the "pushed-set", the set of
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     6
all changesets that requested to be "in sync" after the push (even if they are
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     7
already on both side).
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
     8
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     9
This test belongs to a series of tests checking such set is properly computed
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    10
and applied. This does not tests "obsmarkers" discovery capabilities.
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    11
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    12
Category C: advanced case
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    13
TestCase 1: Multiple pruned changeset atop each other
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    14
Variants:
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    15
# a: explicite push
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    16
# b: bare push
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    17
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    18
C.1 Multiple pruned changeset atop each other
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    19
=============================================
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    20
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
.. {{{
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
..    B
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
..   |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
..    A
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
..   |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
..    O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
.. }}}
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    28
..
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
.. Marker exist from:
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    30
..
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
..  * A (prune)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
..  * B (prune)
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    33
..
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    34
.. Commands run:
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    35
..
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
..  * hg push -r O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
..  * hg push
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    38
..
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
.. Expected exchange:
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    40
..
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
..  * A (prune)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
..  * B (prune)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    43
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    44
Setup
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    45
-----
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    46
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    47
  $ . $TESTDIR/testlib/exchange-obsmarker-util.sh
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    48
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    49
Initial
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    50
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
  $ setuprepos C.1
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
  creating test repo for test case C.1
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    53
  - pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  - main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  - pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  cd into `main` and proceed with env setup
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  $ cd main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  $ mkcommit A
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  $ mkcommit B
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    60
  $ hg prune -qd '0 0' '.~1'
3013
945a0989e41b packaging: merge stable back into default
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 3000
diff changeset
    61
  1 new orphan changesets
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    62
  $ hg prune -qd '0 0' .
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    63
  $ hg log -G --hidden
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    64
  x  f6fbb35d8ac9 (draft): B
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    65
  |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    66
  x  f5bc6836db60 (draft): A
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  |
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  @  a9bdc8b26820 (public): O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    70
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    71
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    72
  ================
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    73
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    74
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    75
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    76
  ===========
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    77
  a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 2eae6a894c52a556ac692c2d0da80e81548b9f08
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    78
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 36f7fefb84e169c95144b085ce25607908f43c05
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    79
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af b5e9a0fe6060fb80fa51366d6fc5b8f3a5c6e1ed
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    80
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    81
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    82
           rev         node        index         size        depth      obshash
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    83
             0 a9bdc8b26820            0            1            1 2eae6a894c52
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  $ cd ..
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
  $ cd ..
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    86
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    87
  $ cp -R C.1 C.1.a
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    88
  $ cp -R C.1 C.1.b
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    89
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    90
Actual Test (explicit push)
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
    91
---------------------------
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    92
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    93
  $ dotest C.1.a O
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    94
  ## Running testcase C.1.a
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    95
  # testing echange of "O" (a9bdc8b26820)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    96
  ## initial state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    97
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    98
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    99
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   100
  # obstore: pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   101
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   102
  ## pushing "O" from main to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   103
  pushing to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   104
  searching for changes
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   105
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   106
  remote: 2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
  ## post push state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   108
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   109
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   110
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   111
  # obstore: pushdest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   112
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   113
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  ## pulling "a9bdc8b26820" from main into pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   116
  pulling from main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   117
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   118
  2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   119
  ## post pull state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   121
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   122
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  # obstore: pushdest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   124
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   125
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   126
  # obstore: pulldest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   127
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   128
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   129
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   130
Actual Test (bare push)
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   131
-------------------------------------
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   132
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   133
  $ dotest C.1.b
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
  ## Running testcase C.1.b
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  ## initial state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   136
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   137
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   138
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   139
  # obstore: pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   140
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   141
  ## pushing from main to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  pushing to pushdest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   143
  searching for changes
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   144
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   145
  remote: 2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   146
  ## post push state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   147
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   148
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   149
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   150
  # obstore: pushdest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   151
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   152
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   153
  # obstore: pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  ## pulling from main into pulldest
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  pulling from main
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  searching for changes
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   157
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
   158
  2 new obsolescence markers
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   159
  ## post pull state
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   160
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   161
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   162
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   163
  # obstore: pushdest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   164
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   165
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)
844
45ca2d5f84be exchange: add test case for C.1
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   166
  # obstore: pulldest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   167
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   168
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (*) {'ef1': '*', 'user': 'test'} (glob)