test-http-bad-server: move on test from bytes-count to pattern
This specific test case is now using the new "close when a pattern is seen"
approach compared to the more fragile "that many bytes were sent" approach.
Since such change are still a bit noisy, we split each change in there own
changesets.
Differential Revision: https://phab.mercurial-scm.org/D12050
--- a/tests/test-http-bad-server.t Sat Jan 22 01:51:28 2022 +0100
+++ b/tests/test-http-bad-server.t Fri Jan 21 15:44:15 2022 +0100
@@ -312,7 +312,9 @@
Server sends an incomplete capabilities response body
-----------------------------------------------------
- $ hg serve --config badserver.close-after-send-bytes=180 -p $HGPORT -d --pid-file=hg.pid -E error.log
+ $ hg serve \
+ > --config badserver.close-after-send-patterns='batch branchmap bund' \
+ > -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone
@@ -329,16 +331,16 @@
readline(*) -> (2?) 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 from 160) -> (20) 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(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(20 from 431) -> (0) batch branchmap bund (py36 !)
- write(160 from 160) -> (20) 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 !)
+ write(160) -> (20) 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 !)
write(20 from 431) -> (0) batch branchmap bund (py3 no-py36 !)
- write(36 from 36) -> (144) HTTP/1.1 200 Script output follows\r\n (no-py3 !)
- write(23 from 23) -> (121) Server: badhttpserver\r\n (no-py3 !)
- write(37 from 37) -> (84) Date: $HTTP_DATE$\r\n (no-py3 !)
- write(41 from 41) -> (43) Content-Type: application/mercurial-0.1\r\n (no-py3 !)
- write(21 from 21) -> (22) Content-Length: 431\r\n (no-py3 !)
- write(2 from 2) -> (20) \r\n (no-py3 !)
+ write(36) -> HTTP/1.1 200 Script output follows\r\n (no-py3 !)
+ write(23) -> Server: badhttpserver\r\n (no-py3 !)
+ write(37) -> Date: $HTTP_DATE$\r\n (no-py3 !)
+ write(41) -> Content-Type: application/mercurial-0.1\r\n (no-py3 !)
+ write(21) -> Content-Length: 431\r\n (no-py3 !)
+ write(2) -> \r\n (no-py3 !)
write(20 from 431) -> (0) batch branchmap bund (no-py3 !)
write limit reached; closing socket
$LOCALIP - - [$ERRDATE$] Exception happened during processing request '/?cmd=capabilities': (glob)