D3176: tests: extract wire protocol shell helpers to standalone file
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Mon Apr 9 11:13:35 EDT 2018
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGfa9faf58959d: tests: extract wire protocol shell helpers to standalone file (authored by indygreg, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D3176?vs=7861&id=7893
REVISION DETAIL
https://phab.mercurial-scm.org/D3176
AFFECTED FILES
tests/test-http-api-httpv2.t
tests/wireprotohelpers.sh
CHANGE DETAILS
diff --git a/tests/wireprotohelpers.sh b/tests/wireprotohelpers.sh
new file mode 100644
--- /dev/null
+++ b/tests/wireprotohelpers.sh
@@ -0,0 +1,41 @@
+HTTPV2=exp-http-v2-0001
+MEDIATYPE=application/mercurial-exp-framing-0003
+
+sendhttpraw() {
+ hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT/
+}
+
+cat > dummycommands.py << EOF
+from mercurial import (
+ wireprototypes,
+ wireproto,
+)
+
+ at wireproto.wireprotocommand('customreadonly', permission='pull')
+def customreadonly(repo, proto):
+ return wireprototypes.bytesresponse(b'customreadonly bytes response')
+
+ at wireproto.wireprotocommand('customreadwrite', permission='push')
+def customreadwrite(repo, proto):
+ return wireprototypes.bytesresponse(b'customreadwrite bytes response')
+EOF
+
+cat >> $HGRCPATH << EOF
+[extensions]
+drawdag = $TESTDIR/drawdag.py
+EOF
+
+enabledummycommands() {
+ cat >> $HGRCPATH << EOF
+[extensions]
+dummycommands = $TESTTMP/dummycommands.py
+EOF
+}
+
+enablehttpv2() {
+ cat >> $1/.hg/hgrc << EOF
+[experimental]
+web.apiserver = true
+web.api.http-v2 = true
+EOF
+}
diff --git a/tests/test-http-api-httpv2.t b/tests/test-http-api-httpv2.t
--- a/tests/test-http-api-httpv2.t
+++ b/tests/test-http-api-httpv2.t
@@ -1,24 +1,5 @@
- $ HTTPV2=exp-http-v2-0001
- $ MEDIATYPE=application/mercurial-exp-framing-0003
-
- $ send() {
- > hg --verbose debugwireproto --peer raw http://$LOCALIP:$HGPORT/
- > }
-
- $ cat > dummycommands.py << EOF
- > from mercurial import wireprototypes, wireproto
- > @wireproto.wireprotocommand('customreadonly', permission='pull')
- > def customreadonly(repo, proto):
- > return wireprototypes.bytesresponse(b'customreadonly bytes response')
- > @wireproto.wireprotocommand('customreadwrite', permission='push')
- > def customreadwrite(repo, proto):
- > return wireprototypes.bytesresponse(b'customreadwrite bytes response')
- > EOF
-
- $ cat >> $HGRCPATH << EOF
- > [extensions]
- > dummycommands = $TESTTMP/dummycommands.py
- > EOF
+ $ . $TESTDIR/wireprotohelpers.sh
+ $ enabledummycommands
$ hg init server
$ cat > server/.hg/hgrc << EOF
@@ -30,7 +11,7 @@
HTTP v2 protocol not enabled by default
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest GET api/$HTTPV2
> user-agent: test
> EOF
@@ -52,18 +33,13 @@
Restart server with support for HTTP v2 API
$ killdaemons.py
- $ cat > server/.hg/hgrc << EOF
- > [experimental]
- > web.apiserver = true
- > web.api.http-v2 = true
- > EOF
-
+ $ enablehttpv2 server
$ hg -R server serve -p $HGPORT -d --pid-file hg.pid
$ cat hg.pid > $DAEMON_PIDS
Request to unknown command yields 404
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/badcommand
> user-agent: test
> EOF
@@ -84,7 +60,7 @@
GET to read-only command yields a 405
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest GET api/$HTTPV2/ro/customreadonly
> user-agent: test
> EOF
@@ -105,7 +81,7 @@
Missing Accept header results in 406
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/customreadonly
> user-agent: test
> EOF
@@ -126,7 +102,7 @@
Bad Accept header results in 406
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/customreadonly
> accept: invalid
> user-agent: test
@@ -149,7 +125,7 @@
Bad Content-Type header results in 415
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/customreadonly
> accept: $MEDIATYPE
> user-agent: test
@@ -174,7 +150,7 @@
Request to read-only command works out of the box
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/customreadonly
> accept: $MEDIATYPE
> content-type: $MEDIATYPE
@@ -208,7 +184,7 @@
GET to read-write request yields 405
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest GET api/$HTTPV2/rw/customreadonly
> user-agent: test
> EOF
@@ -229,7 +205,7 @@
Even for unknown commands
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest GET api/$HTTPV2/rw/badcommand
> user-agent: test
> EOF
@@ -250,7 +226,7 @@
SSL required by default
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/rw/customreadonly
> user-agent: test
> EOF
@@ -285,7 +261,7 @@
Authorized request for valid read-write command works
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/rw/customreadonly
> user-agent: test
> accept: $MEDIATYPE
@@ -317,7 +293,7 @@
Authorized request for unknown command is rejected
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/rw/badcommand
> user-agent: test
> accept: $MEDIATYPE
@@ -340,7 +316,7 @@
debugreflect isn't enabled by default
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/debugreflect
> user-agent: test
> EOF
@@ -377,7 +353,7 @@
Command frames can be reflected via debugreflect
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/debugreflect
> accept: $MEDIATYPE
> content-type: $MEDIATYPE
@@ -408,7 +384,7 @@
Multiple requests to regular command URL are not allowed
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/customreadonly
> accept: $MEDIATYPE
> content-type: $MEDIATYPE
@@ -440,7 +416,7 @@
Multiple requests to "multirequest" URL are allowed
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/multirequest
> accept: $MEDIATYPE
> content-type: $MEDIATYPE
@@ -476,7 +452,7 @@
Interleaved requests to "multirequest" are processed
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/multirequest
> accept: $MEDIATYPE
> content-type: $MEDIATYPE
@@ -531,7 +507,7 @@
Attempting to run a read-write command via multirequest on read-only URL is not allowed
- $ send << EOF
+ $ sendhttpraw << EOF
> httprequest POST api/$HTTPV2/ro/multirequest
> accept: $MEDIATYPE
> content-type: $MEDIATYPE
To: indygreg, #hg-reviewers, yuja
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list