This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5447

test: adding test of issue4700
ClosedPublic

Authored by valentin.gatienbaron on Dec 18 2018, 8:58 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGc236a491ab7b: test-bookmarks-pushpull: add failing test of issue4700
rHG357bd3ecf1b2: test-bookmarks-pushpull: add failing test of issue4700

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

yuja added a subscriber: yuja.Dec 19 2018, 7:09 AM

+ > def wrappedlookup(orig, repo, *args, kwargs):
+ > ret = orig(repo, *args, kwargs)
+ > repo.hook('lookup')
+ > return ret
+ > for table in [wireprotov1server.commands, wireprotov2server.COMMANDS]:
+ > table['lookup'].func = functools.partial(wrappedlookup, table['lookup'].func)

Nit: has to be b'lookup' to support Python 3. Can be fixed in flight.

valentin.gatienbaron added a comment.Dec 19 2018, 8:33 AM

Ok. I added the b'', as this change created a small conflict later.

Closed by commit rHG357bd3ecf1b2: test-bookmarks-pushpull: add failing test of issue4700 (authored by valentin.gatienbaron). · Explain WhyDec 20 2018, 8:14 AM
This revision was automatically updated to reflect the committed changes.
yuja added a comment.Dec 20 2018, 8:24 AM

Queued this, thanks.

Revision Contents
Changeset List

PathPackages
Mtests/test-bookmarks-pushpull.t (60 lines)

Diff 12894

tests/test-bookmarks-pushpull.t

> EOF > EOF
$ cat <<EOF > ../pull-race/.hg/hgrc $ cat <<EOF > ../pull-race/.hg/hgrc
> [hooks] > [hooks]
> # If anything to commit, commit it right after the first key listing used > # If anything to commit, commit it right after the first key listing used
> # during lookup. This makes the commit appear before the actual getbundle > # during lookup. This makes the commit appear before the actual getbundle
> # call. > # call.
> listkeys.makecommit= sh $TESTTMP/listkeys_makecommit.sh > listkeys.makecommit= sh $TESTTMP/listkeys_makecommit.sh
> EOF > EOF
$ restart_server() {
(new config need server restart) > "$TESTDIR/killdaemons.py" $DAEMON_PIDS
> hg serve -R ../pull-race -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log
$ killdaemons.py > cat ../pull-race.pid >> $DAEMON_PIDS
$ hg serve -R ../pull-race -p $HGPORT -d --pid-file=../pull-race.pid -E main-error.log > }
$ cat ../pull-race.pid >> $DAEMON_PIDS $ restart_server # new config need server restart
$ hg -R $TESTTMP/pull-race book $ hg -R $TESTTMP/pull-race book
@ 1:0d2164f0ce0d @ 1:0d2164f0ce0d
X 1:0d2164f0ce0d X 1:0d2164f0ce0d
* Y 5:35d1ef0a8d1b * Y 5:35d1ef0a8d1b
Z 1:0d2164f0ce0d Z 1:0d2164f0ce0d
$ hg update -r Y $ hg update -r Y
1 files updated, 0 files merged, 1 files removed, 0 files unresolved 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
(activating bookmark Y) (activating bookmark Y)
$ hg pull -B . $ hg pull -B .
pulling from http://localhost:$HGPORT/ pulling from http://localhost:$HGPORT/
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
updating bookmark Y updating bookmark Y
new changesets 35d1ef0a8d1b (1 drafts) new changesets 35d1ef0a8d1b (1 drafts)
(run 'hg update' to get a working copy) (run 'hg update' to get a working copy)
$ hg book $ hg book
@ 1:0d2164f0ce0d @ 1:0d2164f0ce0d
X 1:0d2164f0ce0d X 1:0d2164f0ce0d
* Y 5:35d1ef0a8d1b * Y 5:35d1ef0a8d1b
Z 1:0d2164f0ce0d Z 1:0d2164f0ce0d
Update a bookmark right after the initial lookup -r (issue4700)
$ echo c7 > ../pull-race/f3 # to be committed during the race
$ cat <<EOF > ../lookuphook.py
> """small extensions adding a hook after wireprotocol lookup to test race"""
> import functools
> from mercurial import wireprotov1server, wireprotov2server
>
> def wrappedlookup(orig, repo, *args, **kwargs):
> ret = orig(repo, *args, **kwargs)
> repo.hook('lookup')
> return ret
> for table in [wireprotov1server.commands, wireprotov2server.COMMANDS]:
> table[b'lookup'].func = functools.partial(wrappedlookup, table[b'lookup'].func)
> EOF
$ cat <<EOF > ../pull-race/.hg/hgrc
> [extensions]
> lookuphook=$TESTTMP/lookuphook.py
> [hooks]
> lookup.makecommit= sh $TESTTMP/listkeys_makecommit.sh
> EOF
$ restart_server # new config need server restart
$ hg -R $TESTTMP/pull-race book
@ 1:0d2164f0ce0d
X 1:0d2164f0ce0d
* Y 6:0d60821d2197
Z 1:0d2164f0ce0d
$ hg pull -r Y
pulling from http://localhost:$HGPORT/
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
new changesets 0d60821d2197 (1 drafts)
(run 'hg update' to get a working copy)
$ hg book
@ 1:0d2164f0ce0d
X 1:0d2164f0ce0d
* Y 5:35d1ef0a8d1b
Z 1:0d2164f0ce0d
$ hg -R $TESTTMP/pull-race book
@ 1:0d2164f0ce0d
X 1:0d2164f0ce0d
* Y 7:714424d9e8b8
Z 1:0d2164f0ce0d
(done with this section of the test) (done with this section of the test)
$ killdaemons.py $ killdaemons.py
$ cd ../b $ cd ../b
diverging a remote bookmark fails diverging a remote bookmark fails
$ hg up -q 4e3505fd9583 $ hg up -q 4e3505fd9583