This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4559

cleanup: only look for the capabilities we care about in tests
ClosedPublic

Authored by durin42 on Sep 13 2018, 11:02 AM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXdb23ac2909e7: cleanup: only look for the capabilities we care about in tests
Summary

This used to be done with globs, but old versions of hg don't sort
capabilities and recent ones do. Just build a filter and apply it
everywhere we check capabilities. As a bonus, what we're looking for
is now easier to spot in the output.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Sep 13 2018, 11:02 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptSep 13 2018, 11:02 AM
quark accepted this revision.Sep 13 2018, 3:32 PM
This revision is now accepted and ready to land.Sep 13 2018, 3:32 PM
Closed by commit rFBHGXdb23ac2909e7: cleanup: only look for the capabilities we care about in tests (authored by durin42). · Explain WhySep 13 2018, 4:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11023

tests/library.sh

echo "$1" > "$1" echo "$1" > "$1"
hg add "$1" hg add "$1"
hg ci -m "$1" hg ci -m "$1"
} }
ls_l() { ls_l() {
$PYTHON $TESTDIR/ls-l.py "$@" $PYTHON $TESTDIR/ls-l.py "$@"
} }
identifyrflcaps() {
xargs -n 1 echo | egrep '(remotefilelog|getflogheads|getfile)' | sort
}

tests/test-remotefilelog-http.t

$ rm -r $TESTTMP/hgcache $ rm -r $TESTTMP/hgcache
Now do a fetch with a large batch size so we're sure it works Now do a fetch with a large batch size so we're sure it works
$ hgcloneshallow http://localhost:$HGPORT/ shallow-large-batch \ $ hgcloneshallow http://localhost:$HGPORT/ shallow-large-batch \
> --config remotefilelog.batchsize=1000 -q > --config remotefilelog.batchsize=1000 -q
2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob) 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
The 'remotefilelog' capability should *not* be exported over http(s), The 'remotefilelog' capability should *not* be exported over http(s),
as the getfile method it offers doesn't work with http. as the getfile method it offers doesn't work with http.
$ get-with-headers.py localhost:$HGPORT '?cmd=capabilities' $ get-with-headers.py localhost:$HGPORT '?cmd=capabilities' | grep lookup | identifyrflcaps
200 Script output follows getfile
getflogheads
lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream-preferred streamreqs=generaldelta,revlogv1 bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%2C03%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=zstd,zlib getflogheads getfile (no-eol)
$ get-with-headers.py localhost:$HGPORT '?cmd=hello' $ get-with-headers.py localhost:$HGPORT '?cmd=hello' | grep lookup | identifyrflcaps
200 Script output follows getfile
getflogheads
capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream-preferred streamreqs=generaldelta,revlogv1 bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%2C03%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx compression=zstd,zlib getflogheads getfile
$ get-with-headers.py localhost:$HGPORT '?cmd=this-command-does-not-exist' | head -n 1 $ get-with-headers.py localhost:$HGPORT '?cmd=this-command-does-not-exist' | head -n 1
400 no such method: this-command-does-not-exist 400 no such method: this-command-does-not-exist
$ get-with-headers.py localhost:$HGPORT '?cmd=getfiles' | head -n 1 $ get-with-headers.py localhost:$HGPORT '?cmd=getfiles' | head -n 1
400 no such method: getfiles 400 no such method: getfiles
Verify serving from a shallow clone doesn't allow for remotefile Verify serving from a shallow clone doesn't allow for remotefile
fetches. This also serves to test the error handling for our batchable fetches. This also serves to test the error handling for our batchable

tests/test-remotefilelog-pull-noshallow.t

$ cd .. $ cd ..
$ hg clone ssh://user@dummy/master child -q $ hg clone ssh://user@dummy/master child -q
We should see the remotefilelog capability here, which advertises that We should see the remotefilelog capability here, which advertises that
the server supports our custom getfiles method. the server supports our custom getfiles method.
$ cd master $ cd master
$ echo 'hello' | hg -R . serve --stdio $ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps
* (glob) getfile
capabilities: lookup * remotefilelog getflogheads getfile (glob) getflogheads
$ echo 'capabilities' | hg -R . serve --stdio ; echo remotefilelog
* (glob) $ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo
* remotefilelog getflogheads getfile (glob) getfile
getflogheads
remotefilelog
Pull to the child repository. Use our custom setupremotefilelog extension Pull to the child repository. Use our custom setupremotefilelog extension
to ensure that remotefilelog.onetimeclientsetup() gets triggered. (Without to ensure that remotefilelog.onetimeclientsetup() gets triggered. (Without
using chg it normally would not be run in this case since the local repository using chg it normally would not be run in this case since the local repository
is not shallow.) is not shallow.)
$ echo y > y $ echo y > y
$ hg commit -qAm y $ hg commit -qAm y

tests/test-remotefilelog-push-pull.t

$ hgcloneshallow ssh://user@dummy/master shallow -q $ hgcloneshallow ssh://user@dummy/master shallow -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) 1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob)
$ hgcloneshallow ssh://user@dummy/master shallow2 -q $ hgcloneshallow ssh://user@dummy/master shallow2 -q
We should see the remotefilelog capability here, which advertises that We should see the remotefilelog capability here, which advertises that
the server supports our custom getfiles method. the server supports our custom getfiles method.
$ cd master $ cd master
$ echo 'hello' | hg -R . serve --stdio $ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps
* (glob) getfile
capabilities: lookup * remotefilelog getflogheads getfile (glob) getflogheads
$ echo 'capabilities' | hg -R . serve --stdio ; echo remotefilelog
* (glob) $ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo
* remotefilelog getflogheads getfile (glob) getfile
getflogheads
remotefilelog
# pull to shallow from full # pull to shallow from full
$ echo y > y $ echo y > y
$ hg commit -qAm y $ hg commit -qAm y
$ cd ../shallow $ cd ../shallow
$ hg pull $ hg pull
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master