diff --git a/tests/library.sh b/tests/library.sh
--- a/tests/library.sh
+++ b/tests/library.sh
@@ -82,3 +82,7 @@
ls_l() {
$PYTHON $TESTDIR/ls-l.py "$@"
}
+
+identifyrflcaps() {
+ xargs -n 1 echo | egrep '(remotefilelog|getflogheads|getfile)' | sort
+}
diff --git a/tests/test-remotefilelog-http.t b/tests/test-remotefilelog-http.t
--- a/tests/test-remotefilelog-http.t
+++ b/tests/test-remotefilelog-http.t
@@ -36,14 +36,13 @@
The 'remotefilelog' capability should *not* be exported over http(s),
as the getfile method it offers doesn't work with http.
- $ get-with-headers.py localhost:$HGPORT '?cmd=capabilities'
- 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)
- $ get-with-headers.py localhost:$HGPORT '?cmd=hello'
- 200 Script output follows
-
- 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=capabilities' | grep lookup | identifyrflcaps
+ getfile
+ getflogheads
+
+ $ get-with-headers.py localhost:$HGPORT '?cmd=hello' | grep lookup | identifyrflcaps
+ getfile
+ getflogheads
$ get-with-headers.py localhost:$HGPORT '?cmd=this-command-does-not-exist' | head -n 1
400 no such method: this-command-does-not-exist
diff --git a/tests/test-remotefilelog-pull-noshallow.t b/tests/test-remotefilelog-pull-noshallow.t
--- a/tests/test-remotefilelog-pull-noshallow.t
+++ b/tests/test-remotefilelog-pull-noshallow.t
@@ -35,12 +35,15 @@
the server supports our custom getfiles method.
$ cd master
- $ echo 'hello' | hg -R . serve --stdio
- * (glob)
- capabilities: lookup * remotefilelog getflogheads getfile (glob)
- $ echo 'capabilities' | hg -R . serve --stdio ; echo
- * (glob)
- * remotefilelog getflogheads getfile (glob)
+ $ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps
+ getfile
+ getflogheads
+ remotefilelog
+ $ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo
+ getfile
+ getflogheads
+ remotefilelog
+
Pull to the child repository. Use our custom setupremotefilelog extension
to ensure that remotefilelog.onetimeclientsetup() gets triggered. (Without
diff --git a/tests/test-remotefilelog-push-pull.t b/tests/test-remotefilelog-push-pull.t
--- a/tests/test-remotefilelog-push-pull.t
+++ b/tests/test-remotefilelog-push-pull.t
@@ -22,13 +22,15 @@
the server supports our custom getfiles method.
$ cd master
- $ echo 'hello' | hg -R . serve --stdio
- * (glob)
- capabilities: lookup * remotefilelog getflogheads getfile (glob)
- $ echo 'capabilities' | hg -R . serve --stdio ; echo
- * (glob)
- * remotefilelog getflogheads getfile (glob)
-
+ $ echo 'hello' | hg -R . serve --stdio | grep capa | identifyrflcaps
+ getfile
+ getflogheads
+ remotefilelog
+ $ echo 'capabilities' | hg -R . serve --stdio | identifyrflcaps ; echo
+ getfile
+ getflogheads
+ remotefilelog
+
# pull to shallow from full
$ echo y > y