marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This test case is now less sensitive to change of unrelated bits of the client/server exchange. Since this introduce some churn in the output, we do it independently for each test cases. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12070 AFFECTED FILES tests/test-http-bad-server.t CHANGE DETAILS diff --git a/tests/test-http-bad-server.t b/tests/test-http-bad-server.t --- a/tests/test-http-bad-server.t +++ b/tests/test-http-bad-server.t @@ -112,7 +112,10 @@ Failure on subsequent HTTP request on the same socket (cmd?batch) ----------------------------------------------------------------- - $ hg serve --config badserver.close-after-recv-bytes=210,223 -p $HGPORT -d --pid-file=hg.pid -E error.log + $ hg serve \ + > --config badserver.close-after-recv-patterns="GET /\?cmd=batch," \ + > --config badserver.close-after-recv-bytes=15,223 \ + > -p $HGPORT -d --pid-file=hg.pid -E error.log $ cat hg.pid > $DAEMON_PIDS $ hg clone http://localhost:$HGPORT/ clone abort: error: bad HTTP status line: * (glob) @@ -121,12 +124,12 @@ $ killdaemons.py $DAEMON_PIDS $ cat error.log - readline(210 from ~) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n - readline(177 from *) -> (27) Accept-Encoding: identity\r\n (glob) - readline(150 from *) -> (35) accept: application/mercurial-0.1\r\n (glob) - readline(115 from *) -> (*) host: localhost:$HGPORT\r\n (glob) - readline(* from *) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n (glob) - readline(* from *) -> (2) \r\n (glob) + readline(~) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n + readline(*) -> (27) Accept-Encoding: identity\r\n (glob) + readline(*) -> (35) accept: application/mercurial-0.1\r\n (glob) + readline(*) -> (*) host: localhost:$HGPORT\r\n (glob) + readline(*) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n (glob) + readline(*) -> (2) \r\n (glob) sendall(160) -> HTTP/1.1 200 Script output follows\r\nServer: badhttpserver\r\nDate: $HTTP_DATE$\r\nContent-Type: application/mercurial-0.1\r\nContent-Length: 431\r\n\r\n (py36 !) sendall(431) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (py36 !) write(160) -> HTTP/1.1 200 Script output follows\r\nServer: badhttpserver\r\nDate: $HTTP_DATE$\r\nContent-Type: application/mercurial-0.1\r\nContent-Length: 431\r\n\r\n (py3 no-py36 !) @@ -138,8 +141,8 @@ write(21) -> Content-Length: 431\r\n (no-py3 !) write(2) -> \r\n (no-py3 !) write(431) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-py3 !) - readline(4? from ~) -> (26) GET /?cmd=batch HTTP/1.1\r\n (glob) - readline(1? from *) -> (1?) Accept-Encoding* (glob) + readline(~) -> (26) GET /?cmd=batch HTTP/1.1\r\n (glob) + readline(*) -> (1?) Accept-Encoding* (glob) read limit reached; closing socket readline(223 from ~) -> (26) GET /?cmd=batch HTTP/1.1\r\n readline(197 from *) -> (27) Accept-Encoding: identity\r\n (glob) To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
