This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12039

test-http-bad-server: align output by using `;`
ClosedPublic

Authored by marmoute on Jan 24 2022, 9:44 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGf87b632406a9: test-http-bad-server: align output by using `;`
Summary

This is the only message using a , instead of ; and that seems
unintentional. I am unifying the message before unigying the code.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Jan 24 2022, 9:44 AM
Alphare accepted this revision.Jan 24 2022, 9:52 AM
This revision is now accepted and ready to land.Jan 24 2022, 9:52 AM
marmoute added a commit: rHGf87b632406a9: test-http-bad-server: align output by using `;`.Jan 25 2022, 4:17 AM
Closed by commit rHGf87b632406a9: test-http-bad-server: align output by using `;` (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31915

tests/test-http-bad-server.t

readline(216 from *) -> (19) x-hgargs-post: 28\r\n (glob) readline(216 from *) -> (19) x-hgargs-post: 28\r\n (glob)
readline(197 from *) -> (61) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull\r\n (glob) readline(197 from *) -> (61) x-hgproto-1: 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull\r\n (glob)
readline(136 from *) -> (35) accept: application/mercurial-0.1\r\n (glob) readline(136 from *) -> (35) accept: application/mercurial-0.1\r\n (glob)
readline(101 from *) -> (20) content-length: 28\r\n (glob) readline(101 from *) -> (20) content-length: 28\r\n (glob)
readline(81 from *) -> (*) host: localhost:$HGPORT\r\n (glob) readline(81 from *) -> (*) host: localhost:$HGPORT\r\n (glob)
readline(* from *) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\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(* from *) -> (2) \r\n (glob)
read(* from 28) -> (*) cmds=* (glob) read(* from 28) -> (*) cmds=* (glob)
read limit reached, closing socket read limit reached; closing socket
$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/?cmd=batch': (glob) $LOCALIP - - [$ERRDATE$] Exception happened during processing request '/?cmd=batch': (glob)
Traceback (most recent call last): Traceback (most recent call last):
Exception: connection closed after receiving N bytes Exception: connection closed after receiving N bytes
write(126) -> HTTP/1.1 500 Internal Server Error\r\nServer: badhttpserver\r\nDate: $HTTP_DATE$\r\nTransfer-Encoding: chunked\r\n\r\n (py3 no-py36 !) write(126) -> HTTP/1.1 500 Internal Server Error\r\nServer: badhttpserver\r\nDate: $HTTP_DATE$\r\nTransfer-Encoding: chunked\r\n\r\n (py3 no-py36 !)
write(36) -> HTTP/1.1 500 Internal Server Error\r\n (no-py3 !) write(36) -> HTTP/1.1 500 Internal Server Error\r\n (no-py3 !)
$ rm -f error.log $ rm -f error.log

tests/testlib/badserverext.py

self._writelog( self._writelog(
b'read(%d from %d) -> (%d) %s' b'read(%d from %d) -> (%d) %s'
% (size, origsize, len(result), result) % (size, origsize, len(result), result)
) )
object.__setattr__(self, '_closeafterrecvbytes', remaining) object.__setattr__(self, '_closeafterrecvbytes', remaining)
if remaining <= 0: if remaining <= 0:
self._writelog(b'read limit reached, closing socket') self._writelog(b'read limit reached; closing socket')
self._close() self._close()
# This is the easiest way to abort the current request. # This is the easiest way to abort the current request.
raise Exception('connection closed after receiving N bytes') raise Exception('connection closed after receiving N bytes')
return result return result
def readline(self, size=-1): def readline(self, size=-1):