This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5412

test: fix test-http-bad-server with current python 2.7
ClosedPublic

Authored by jcristau on Dec 12 2018, 12:55 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG21f5810df848: test: fix test-http-bad-server with current python 2.7
Summary

https://github.com/python/cpython/pull/2825 changed the exception
message for empty http status line.

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

jcristau created this revision.Dec 12 2018, 12:55 AM
yuja added a subscriber: yuja.Dec 12 2018, 7:01 AM

Queued this for stable, thanks.

Closed by commit rHG21f5810df848: test: fix test-http-bad-server with current python 2.7 (authored by jcristau). · Explain WhyDec 12 2018, 7:25 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/test-http-bad-server.t (10 lines)

Diff 12825

tests/test-http-bad-server.t

$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
Failure to read all bytes in initial HTTP request should yield connection related error message Failure to read all bytes in initial HTTP request should yield connection related error message
$ hg serve --config badserver.closeafterrecvbytes=1 -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg serve --config badserver.closeafterrecvbytes=1 -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: bad HTTP status line: '' abort: error: bad HTTP status line: * (glob)
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(1 from 65537) -> (1) G readline(1 from 65537) -> (1) G
read limit reached; closing socket read limit reached; closing socket
$ rm -f error.log $ rm -f error.log
Same failure, but server reads full HTTP request line Same failure, but server reads full HTTP request line
$ hg serve --config badserver.closeafterrecvbytes=40 -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg serve --config badserver.closeafterrecvbytes=40 -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: bad HTTP status line: '' abort: error: bad HTTP status line: * (glob)
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(40 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(40 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(7 from -1) -> (7) Accept- readline(7 from -1) -> (7) Accept-
read limit reached; closing socket read limit reached; closing socket
$ rm -f error.log $ rm -f error.log
Failure on subsequent HTTP request on the same socket (cmd?batch) Failure on subsequent HTTP request on the same socket (cmd?batch)
$ hg serve --config badserver.closeafterrecvbytes=210,223 -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg serve --config badserver.closeafterrecvbytes=210,223 -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: bad HTTP status line: '' abort: error: bad HTTP status line: * (glob)
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(210 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(210 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(177 from -1) -> (27) Accept-Encoding: identity\r\n readline(177 from -1) -> (27) Accept-Encoding: identity\r\n
readline(150 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(150 from -1) -> (35) accept: application/mercurial-0.1\r\n
$ rm -f error.log $ rm -f error.log
Failure to read getbundle HTTP request Failure to read getbundle HTTP request
$ hg serve --config badserver.closeafterrecvbytes=308,317,304 -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg serve --config badserver.closeafterrecvbytes=308,317,304 -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
requesting all changes requesting all changes
abort: error: bad HTTP status line: '' abort: error: bad HTTP status line: * (glob)
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(1 from -1) -> (1) x (?) readline(1 from -1) -> (1) x (?)
readline(1 from -1) -> (1) x (?) readline(1 from -1) -> (1) x (?)
readline(308 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(308 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
$ rm -f error.log $ rm -f error.log
Now do a variation using POST to send arguments Now do a variation using POST to send arguments
$ hg serve --config experimental.httppostargs=true --config badserver.closeafterrecvbytes=329,344 -p $HGPORT -d --pid-file=hg.pid -E error.log $ hg serve --config experimental.httppostargs=true --config badserver.closeafterrecvbytes=329,344 -p $HGPORT -d --pid-file=hg.pid -E error.log
$ cat hg.pid > $DAEMON_PIDS $ cat hg.pid > $DAEMON_PIDS
$ hg clone http://localhost:$HGPORT/ clone $ hg clone http://localhost:$HGPORT/ clone
abort: error: bad HTTP status line: '' abort: error: bad HTTP status line: * (glob)
[255] [255]
$ killdaemons.py $DAEMON_PIDS $ killdaemons.py $DAEMON_PIDS
$ cat error.log $ cat error.log
readline(329 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n readline(329 from 65537) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
readline(296 from -1) -> (27) Accept-Encoding: identity\r\n readline(296 from -1) -> (27) Accept-Encoding: identity\r\n
readline(269 from -1) -> (35) accept: application/mercurial-0.1\r\n readline(269 from -1) -> (35) accept: application/mercurial-0.1\r\n