tests/test-exchange-obsmarkers-case-B4.t
author Pulkit Goyal <7895pulkit@gmail.com>
Mon, 22 Jan 2018 14:10:59 +0530
branchstable
changeset 3452 8275ef099135
parent 2580 51a1dd295fe0
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 B.4
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
     3
============================================
840
6689b9d351f7 exchange: add test case for B.4
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).
840
6689b9d351f7 exchange: add test case for B.4
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.
840
6689b9d351f7 exchange: add test case for B.4
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 B: pruning case
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    13
TestCase 4: Pruned changeset on common part of the history
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
B.4 Pruned changeset on common part of history
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    19
=============================================
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    20
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    21
.. {{{
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    22
..    C
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    23
..   |  B
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    24
..   | |
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    25
..   |  A
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    26
..   |/
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    27
..    O
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    28
.. }}}
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    29
..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    30
.. Marker exist from:
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    31
..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    32
..  * C (prune)
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    33
..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    34
.. Command run:
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    35
..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    36
..  * hg push -r B
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    37
..  * hg push
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    38
..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    39
.. Expected exchange:
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    40
..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    41
..  * prune for C
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    42
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    43
Setup
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    44
-----
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
  $ . $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
    47
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    48
initial
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    49
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    50
  $ setuprepos B.4
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    51
  creating test repo for test case B.4
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    52
  - pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    53
  - main
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    54
  - pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    55
  cd into `main` and proceed with env setup
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    56
  $ cd main
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    57
  $ mkcommit A
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    58
  $ mkcommit B
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    59
  $ hg phase --public .
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    60
  $ hg push ../pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    61
  pushing to ../pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    62
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    63
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    64
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    65
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    66
  remote: added 2 changesets with 2 changes to 2 files
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    67
  $ hg push ../pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    68
  pushing to ../pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    69
  searching for changes
1089
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    70
  remote: adding changesets
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    71
  remote: adding manifests
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    72
  remote: adding file changes
cdd22a5e5ef1 enable bundle2
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1088
diff changeset
    73
  remote: added 2 changesets with 2 changes to 2 files
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    74
  $ hg update -q 0
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    75
  $ mkcommit C
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    76
  created new head
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    77
  $ hg prune -qd '0 0' .
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    78
  $ hg log -G --hidden
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    79
  x  7f7f229b13a6 (draft): C
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    80
  |
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    81
  | o  f6fbb35d8ac9 (public): B
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    82
  | |
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    83
  | o  f5bc6836db60 (public): A
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    84
  |/
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
    85
  @  a9bdc8b26820 (public): O
6689b9d351f7 exchange: add test case for B.4
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
  $ inspect_obsmarkers
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    88
  obsstore content
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    89
  ================
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    90
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'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
    91
  obshashtree
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    92
  ===========
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    93
  a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 000a06f93df9cdd3c570d38aef8cd21a4a25df9b
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    94
  f5bc6836db60e308a17ba08bf050154ba9c4fad7 ff621c458a04f2994124b0ef4b43572f7eb2335a
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    95
  f6fbb35d8ac958bbe70035e4c789c18471cdc0af 5afda6754e34bfe9ac1942df123711f929054273
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
    96
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed f3513f70438639d6687bbec74f4d3fd11853f471
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    97
  obshashrange
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
    98
  ============
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
    99
           rev         node        index         size        depth      obshash
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   100
             2 f6fbb35d8ac9            0            3            3 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   101
             1 f5bc6836db60            0            2            2 000000000000
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   102
             0 a9bdc8b26820            0            1            1 000a06f93df9
2228
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   103
             1 f5bc6836db60            1            1            2 000000000000
3b18440cca74 debugstablerange: improve output spacing
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2118
diff changeset
   104
             2 f6fbb35d8ac9            2            1            3 000000000000
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   105
  $ cd ..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   106
  $ cd ..
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   107
2268
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   108
  $ cp -R B.4 B.4.a
f2ebe960998b tests: update test to match upstreamable version
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents: 2230
diff changeset
   109
  $ cp -R B.4 B.4.b
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   110
984
b286f77d680c tests: fix grammar, spelling, punctuation in comments
Greg Ward <greg@gerg.ca>
parents: 957
diff changeset
   111
Actual Test (explicit push version)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   112
-----------------------------------
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   113
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   114
  $ dotest B.4.a O
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   115
  ## Running testcase B.4.a
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   116
  # testing echange of "O" (a9bdc8b26820)
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   117
  ## initial state
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   118
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   119
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   120
  # obstore: pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   121
  # obstore: pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   122
  ## pushing "O" from main to pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   123
  pushing to pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   124
  searching for changes
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   125
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   126
  remote: 1 new obsolescence markers
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   127
  ## post push state
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   128
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   129
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   130
  # obstore: pushdest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   131
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   132
  # obstore: pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   133
  ## pulling "a9bdc8b26820" from main into pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   134
  pulling from main
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   135
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   136
  1 new obsolescence markers
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   137
  ## post pull state
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   138
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   139
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   140
  # obstore: pushdest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   141
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   142
  # obstore: pulldest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   143
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   144
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   145
Actual Test (bare push version)
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   146
-----------------------------------
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   147
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   148
  $ dotest B.4.b
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   149
  ## Running testcase B.4.b
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   150
  ## initial state
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   151
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   152
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   153
  # obstore: pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   154
  # obstore: pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   155
  ## pushing from main to pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   156
  pushing to pushdest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   157
  searching for changes
1078
5717d023da63 obsexc: use the common discovery
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1067
diff changeset
   158
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   159
  remote: 1 new obsolescence markers
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   160
  ## post push state
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   161
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   162
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
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
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   165
  # obstore: pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   166
  ## pulling from main into pulldest
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   167
  pulling from main
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   168
  searching for changes
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   169
  no changes found
1093
a49f2e7a2755 obsexch: respect todosteps when using the old push
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 1089
diff changeset
   170
  1 new obsolescence markers
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   171
  ## post pull state
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   172
  # obstore: main
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   173
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   174
  # obstore: pushdest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   175
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)
840
6689b9d351f7 exchange: add test case for B.4
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff changeset
   176
  # obstore: pulldest
2580
51a1dd295fe0 effectflag: activate effect flag for obsmarkers-case-*.t test files
Boris Feld <boris.feld@octobus.net>
parents: 2525
diff changeset
   177
  7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (*) {'ef1': '*', 'user': 'test'} (glob)