This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4558

tests: update remotefilelog http test to require two fetches
ClosedPublic

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

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX92d40aaff27d: tests: update remotefilelog http test to require two fetches
Summary

Mercurial 4.7 is smart enough to skip batching if there's only one
request, so let's make it work a little harder.

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 rFBHGX92d40aaff27d: tests: update remotefilelog http test to require two fetches (authored by durin42). · Explain WhySep 13 2018, 4:54 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-remotefilelog-http.t (13 lines)

Diff 11022

tests/test-remotefilelog-http.t

$ PYTHONPATH=$TESTDIR/..:$PYTHONPATH $ PYTHONPATH=$TESTDIR/..:$PYTHONPATH
$ export PYTHONPATH $ export PYTHONPATH
$ . "$TESTDIR/library.sh" $ . "$TESTDIR/library.sh"
$ hginit master $ hginit master
$ cd master $ cd master
$ cat >> .hg/hgrc <<EOF $ cat >> .hg/hgrc <<EOF
> [remotefilelog] > [remotefilelog]
> server=True > server=True
> EOF > EOF
$ echo x > x $ echo x > x
$ echo y > y
$ hg commit -qAm x $ hg commit -qAm x
$ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log -A ../access.log $ hg serve -p $HGPORT -d --pid-file=../hg1.pid -E ../error.log -A ../access.log
Build a query string for later use: Build a query string for later use:
$ GET=`hg debugdata -m 0 | python -c \ $ GET=`hg debugdata -m 0 | python -c \
> 'import sys ; print [("?cmd=getfile&file=%s&node=%s" % tuple(s.split("\0"))) for s in sys.stdin.read().splitlines()][0]'` > 'import sys ; print [("?cmd=getfile&file=%s&node=%s" % tuple(s.split("\0"))) for s in sys.stdin.read().splitlines()][0]'`
$ cd .. $ cd ..
$ cat hg1.pid >> $DAEMON_PIDS $ cat hg1.pid >> $DAEMON_PIDS
$ hgcloneshallow http://localhost:$HGPORT/ shallow -q $ hgcloneshallow http://localhost:$HGPORT/ shallow -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
$ grep batch access.log | grep getfile $ grep getfile access.log
* "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=getfile+*node%3D1406e74118627694268417491f018a4a883152f0* (glob) * "GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=getfile+*node%3D1406e74118627694268417491f018a4a883152f0* (glob)
Clear filenode cache so we can test fetching with a modified batch size Clear filenode cache so we can test fetching with a modified batch size
$ 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
1 files fetched over 1 fetches - (1 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'
200 Script output follows 200 Script output follows
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) 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'
This GET should work, because this server is serving master, which is This GET should work, because this server is serving master, which is
a full clone. a full clone.
$ get-with-headers.py localhost:$HGPORT "$GET" $ get-with-headers.py localhost:$HGPORT "$GET"
200 Script output follows 200 Script output follows
0\x00U\x00\x00\x00\xff (esc) 0\x00U\x00\x00\x00\xff (esc)
2\x00x (esc) 2\x00x (esc)
\x14\x06\xe7A\x18bv\x94&\x84\x17I\x1f\x01\x8aJ\x881R\xf0\x00\x01\x00\x14\xf0\x06\xb2\x92\xc1\xe31\x1f\xd0\xf1:\xe8;@\x9c\xaa\xe4\xa6\xd1\xfb4\x8c\x00 (no-eol) (esc) \x14\x06\xe7A\x18bv\x94&\x84\x17I\x1f\x01\x8aJ\x881R\xf0\x00\x01\x00\x14\xf0\x06T\xd8\xef\x99"\x04\xd01\xe6\xa6i\xf4~\x98\xb3\xe3Dw>T\x00 (no-eol) (esc)
This GET should fail using the in-band signalling mechanism, because This GET should fail using the in-band signalling mechanism, because
it's not a full clone. Note that it's also plausible for servers to it's not a full clone. Note that it's also plausible for servers to
refuse to serve file contents for other reasons, like the file refuse to serve file contents for other reasons, like the file
contents not being visible to the current user. contents not being visible to the current user.
$ get-with-headers.py localhost:$HGPORT1 "$GET" $ get-with-headers.py localhost:$HGPORT1 "$GET"
200 Script output follows 200 Script output follows
1\x00cannot fetch remote files from shallow repo (no-eol) (esc) 1\x00cannot fetch remote files from shallow repo (no-eol) (esc)
Clones should work with httppostargs turned on Clones should work with httppostargs turned on
$ cd master $ cd master
$ hg --config experimental.httppostargs=1 serve -p $HGPORT2 -d --pid-file=../hg3.pid -E ../error3.log $ hg --config experimental.httppostargs=1 serve -p $HGPORT2 -d --pid-file=../hg3.pid -E ../error3.log
$ cd .. $ cd ..
$ cat hg3.pid >> $DAEMON_PIDS $ cat hg3.pid >> $DAEMON_PIDS
Clear filenode cache so we can test fetching with a modified batch size Clear filenode cache so we can test fetching with a modified batch size
$ rm -r $TESTTMP/hgcache $ rm -r $TESTTMP/hgcache
$ hgcloneshallow http://localhost:$HGPORT2/ shallow-postargs -q $ hgcloneshallow http://localhost:$HGPORT2/ shallow-postargs -q
1 files fetched over 1 fetches - (1 misses, 0.00% hit ratio) over *s (glob) 2 files fetched over 1 fetches - (2 misses, 0.00% hit ratio) over *s (glob)
All error logs should be empty: All error logs should be empty:
$ cat error.log $ cat error.log
$ cat error2.log $ cat error2.log
$ cat error3.log $ cat error3.log