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 @@ -18,7 +18,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/exp-http-v2-0003 HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -47,7 +47,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/badcommand HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -69,7 +69,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/exp-http-v2-0003/ro/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -91,7 +91,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -114,7 +114,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: invalid\r\n @@ -139,7 +139,7 @@ > content-type: badmedia > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -166,7 +166,7 @@ > frame 1 1 stream-begin command-request new cbor:{b'name': b'customreadonly'} > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> *\r\n (glob) @@ -203,7 +203,7 @@ > EOF creating http peer for wire protocol version 2 sending customreadonly command - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -251,7 +251,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/exp-http-v2-0003/rw/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -273,7 +273,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/exp-http-v2-0003/rw/badcommand HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -295,7 +295,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/rw/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -334,7 +334,7 @@ > frame 1 1 stream-begin command-request new cbor:{b'name': b'customreadonly'} > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/rw/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -374,7 +374,7 @@ > accept: $MEDIATYPE > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/rw/badcommand HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -397,7 +397,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/debugreflect HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -438,7 +438,7 @@ > frame 1 1 stream-begin command-request new cbor:{b'name': b'command1', b'args': {b'foo': b'val1', b'bar1': b'val'}} > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/debugreflect HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -470,7 +470,7 @@ > frame 1 1 stream-begin command-request new cbor:{b'name': b'customreadonly'} > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/customreadonly HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -513,7 +513,7 @@ > frame 3 1 0 command-request new cbor:{b'name': b'customreadonly'} > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/multirequest HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> *\r\n (glob) @@ -567,7 +567,7 @@ > frame 1 1 0 command-request continuation IbookmarksDnameHlistkeys > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/multirequest HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -633,7 +633,7 @@ > frame 1 1 stream-begin command-request new cbor:{b'name': b'pushkey'} > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/multirequest HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -660,7 +660,7 @@ creating http peer for wire protocol version 2 sending heads command wire protocol version 2 encoder referenced in config (badencoder) is not known; ignoring - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/heads HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -706,7 +706,7 @@ > EOF creating http peer for wire protocol version 2 sending heads command - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/heads HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n diff --git a/tests/test-http-api.t b/tests/test-http-api.t --- a/tests/test-http-api.t +++ b/tests/test-http-api.t @@ -156,7 +156,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -178,7 +178,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/ HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -202,7 +202,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/unknown HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -225,7 +225,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/exp-http-v2-0003 HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -259,7 +259,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -281,7 +281,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /api/ HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n diff --git a/tests/test-http-protocol.t b/tests/test-http-protocol.t --- a/tests/test-http-protocol.t +++ b/tests/test-http-protocol.t @@ -179,7 +179,7 @@ > command listkeys > namespace namespaces > EOF - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-0.1\r\n @@ -195,7 +195,7 @@ s> \r\n s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash sending listkeys command - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /?cmd=listkeys HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> vary: X-HgArg-1,X-HgProto-1\r\n @@ -230,7 +230,7 @@ > x-hgarg-1: namespace=namespaces > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /?cmd=listkeys HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -253,7 +253,7 @@ $ hg --config experimental.httppeer.advertise-v2=true --verbose debugwireproto http://$LOCALIP:$HGPORT << EOF > command heads > EOF - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> vary: X-HgProto-1,X-HgUpgrade-1\r\n @@ -272,7 +272,7 @@ s> \r\n s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash sending heads command - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /?cmd=heads HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> vary: X-HgProto-1\r\n @@ -304,7 +304,7 @@ $ hg --config experimental.httppeer.advertise-v2=true --config experimental.httppeer.v2-encoder-order=identity --verbose debugwireproto http://$LOCALIP:$HGPORT << EOF > command heads > EOF - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> vary: X-HgProto-1,X-HgUpgrade-1\r\n @@ -323,7 +323,7 @@ s> \r\n s> \xa3GapibaseDapi/Dapis\xa1Pexp-http-v2-0003\xa4Hcommands\xacIbranchmap\xa2Dargs\xa0Kpermissions\x81DpullLcapabilities\xa2Dargs\xa0Kpermissions\x81DpullMchangesetdata\xa2Dargs\xa2Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84IbookmarksGparentsEphaseHrevisionIrevisions\xa2Hrequired\xf5DtypeDlistKpermissions\x81DpullHfiledata\xa2Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x83HlinknodeGparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDpath\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullIfilesdata\xa3Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x84NfirstchangesetHlinknodeGparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolJpathfilter\xa3Gdefault\xf6Hrequired\xf4DtypeDdictIrevisions\xa2Hrequired\xf5DtypeDlistKpermissions\x81DpullTrecommendedbatchsize\x19\xc3PEheads\xa2Dargs\xa1Jpubliconly\xa3Gdefault\xf4Hrequired\xf4DtypeDboolKpermissions\x81DpullEknown\xa2Dargs\xa1Enodes\xa3Gdefault\x80Hrequired\xf4DtypeDlistKpermissions\x81DpullHlistkeys\xa2Dargs\xa1Inamespace\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullFlookup\xa2Dargs\xa1Ckey\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullLmanifestdata\xa3Dargs\xa4Ffields\xa4Gdefault\xd9\x01\x02\x80Hrequired\xf4DtypeCsetKvalidvalues\xd9\x01\x02\x82GparentsHrevisionKhaveparents\xa3Gdefault\xf4Hrequired\xf4DtypeDboolEnodes\xa2Hrequired\xf5DtypeDlistDtree\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpullTrecommendedbatchsize\x1a\x00\x01\x86\xa0Gpushkey\xa2Dargs\xa4Ckey\xa2Hrequired\xf5DtypeEbytesInamespace\xa2Hrequired\xf5DtypeEbytesCnew\xa2Hrequired\xf5DtypeEbytesCold\xa2Hrequired\xf5DtypeEbytesKpermissions\x81DpushPrawstorefiledata\xa2Dargs\xa2Efiles\xa2Hrequired\xf5DtypeDlistJpathfilter\xa3Gdefault\xf6Hrequired\xf4DtypeDlistKpermissions\x81DpullQframingmediatypes\x81X&application/mercurial-exp-framing-0006Rpathfilterprefixes\xd9\x01\x02\x82Epath:Lrootfilesin:Nrawrepoformats\x83LgeneraldeltaHrevlogv1LsparserevlogNv1capabilitiesY\x01\xe0batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash sending heads command - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> POST /api/exp-http-v2-0003/ro/heads HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-exp-framing-0006\r\n @@ -411,7 +411,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirector?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -426,7 +426,7 @@ s> Content-Length: 10\r\n s> \r\n s> redirected - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirected?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -446,7 +446,7 @@ $ hg --verbose debugwireproto http://$LOCALIP:$HGPORT/redirector << EOF > command heads > EOF - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirector?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-0.1\r\n @@ -462,7 +462,7 @@ s> Content-Length: 10\r\n s> \r\n s> redirected - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirected?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-0.1\r\n @@ -479,7 +479,7 @@ real URL is http://$LOCALIP:$HGPORT/redirected (glob) s> batch branchmap $USUAL_BUNDLE2_CAPS$ changegroupsubset compression=$BUNDLE2_COMPRESSIONS$ getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1,sparserevlog unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash sending heads command - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirected?cmd=heads HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> vary: X-HgProto-1\r\n @@ -517,7 +517,7 @@ > user-agent: test > EOF using raw connection to peer - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirector?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -532,7 +532,7 @@ s> Content-Length: 10\r\n s> \r\n s> redirected - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirected HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> user-agent: test\r\n @@ -674,7 +674,7 @@ $ hg --verbose debugwireproto http://$LOCALIP:$HGPORT/redirector << EOF > command heads > EOF - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirector?cmd=capabilities HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-0.1\r\n @@ -690,7 +690,7 @@ s> Content-Length: 10\r\n s> \r\n s> redirected - s> setsockopt(6, 1, 1) -> None (py3 !) + s> setsockopt(6, 1, 1) -> None (?) s> GET /redirected HTTP/1.1\r\n s> Accept-Encoding: identity\r\n s> accept: application/mercurial-0.1\r\n @@ -733,7 +733,7 @@ s>