This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12073

test-http-bad-server: use the new pattern-reading for a test-case
ClosedPublic

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

Download Raw Diff

Details

Reviewers

Alphare

Group Reviewers

hg-reviewers

Commits

rHG009e86022a9d: test-http-bad-server: use the new pattern-reading for a test-case

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. This patch is the last of such changes, for both sent and recv
cases.

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:49 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJan 24 2022, 9:49 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D12074: test-http-bad-server: abstract the `streamreqs` value.Jan 24 2022, 9:49 AM

Alphare accepted this revision.Jan 24 2022, 10:51 AM

This revision is now accepted and ready to land.Jan 24 2022, 10:51 AM

Alphare requested changes to this revision.Jan 24 2022, 10:53 AM

This revision now requires changes to proceed.Jan 24 2022, 10:53 AM

Alphare accepted this revision.Jan 24 2022, 10:53 AM

This revision is now accepted and ready to land.Jan 24 2022, 10:53 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

marmoute added a commit: rHG009e86022a9d: test-http-bad-server: use the new pattern-reading for a test-case.Jan 25 2022, 4:22 AM

Closed by commit rHG009e86022a9d: test-http-bad-server: use the new pattern-reading for a test-case (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/test-http-bad-server.t (54 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	31776		Jan 24 2022, 9:49 AM	★	★
Diff 2	31897		Jan 24 2022, 1:20 PM	★	★
Diff 3	31949	rHG009e86022a9dc21c255c8b5aa20b6cff2a44f600	Jan 21 2022, 1:57 PM	★	★

Status	Author	Revision
Closed	marmoute	D11997 share-safe: enable by default (BC)
Closed	marmoute	D11996 share-safe: add support for static-http repository
Closed	marmoute	D11995 legacy-revlog: fix requirement computation when cloning legacy repo
Closed	marmoute	D11994 requirements: do not warn about dropping share-safe, unless explicitly set
Closed	marmoute	D11993 sparse: take lock before writing requirements
Closed	marmoute	D11992 largefiles: take lock before writing requirements
Closed	marmoute	D11991 lfs: take lock before writing requirements
Closed	marmoute	D11990 test: simpler requirements matching in test-repo-compengines.t
Closed	marmoute	D11989 test: simpler requirements matching in test-lfs-largefiles.t
Closed	marmoute	D11988 test: simpler requirements matching in test-sidedata.t
Closed	marmoute	D11987 test: simpler requirement matching in test-revlog-v2.t
Closed	marmoute	D11986 test-copies: narrow the format check in test-copies-in-changeset.t
Closed	marmoute	D11985 tests: use debugrequires instead of grepping the file directly
Closed	marmoute	D11984 tests: use debugrequires in test-upgrade-repo.t
Closed	marmoute	D11983 test: do not use `which` to find an exec path in the test
Closed	marmoute	D11982 stream-clone: stop considering working copy only requirements
Closed	marmoute	D12084 stream-clone: also filter the requirement we put in the bundle 2
Closed	marmoute	D12083 requirements: add an official `REVLOG_COMPRESSION_ZSTD` const
Closed	marmoute	D12082 stream-requirements: smoother matching in test-http-protocol.t
Closed	marmoute	D12081 stream-requirements: smoother matching in test-ssh-bundle1.t
Closed	marmoute	D12080 stream-requirements: smoother matching in test-ssh-proto.t
Closed	marmoute	D12079 stream-requirements: smoother matching in test-hgweb-commands.t
Closed	marmoute	D12078 stream-requirements: smoother matching in test-treemanifest.t
Closed	marmoute	D12077 stream-requirements: smoother matching in test-ssh-proto-unbundle.t
Closed	marmoute	D12076 test-bundle: split some variant in there own section
Closed	marmoute	D12075 test-bundle: split each variant in there own section
Closed	marmoute	D12074 test-http-bad-server: abstract the `streamreqs` value
Closed	marmoute	D12073 test-http-bad-server: use the new pattern-reading for a test-case
Closed	marmoute	D12072 test-http-bad-server: use the new pattern-reading for a test-case
Closed	marmoute	D12071 test-http-bad-server: use the new pattern-reading for a test-case
Closed	marmoute	D12070 test-http-bad-server: use the new pattern-reading for a test-case
Closed	marmoute	D12069 test-http-bad-server: use the new pattern-reading for a test-case
Closed	marmoute	D12068 test-http-bad-server: introduce socket closing after reading a pattern
Closed	marmoute	D12067 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12066 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12065 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12064 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12063 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12062 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12061 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12060 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12059 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12058 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12057 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12056 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12055 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12054 test-http-bad-server: modify some `tail` call fit their goal
Closed	marmoute	D12053 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12052 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12051 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12050 test-http-bad-server: move on test from bytes-count to pattern
Closed	marmoute	D12049 test-bad-http-server: introduce sock closing when writing a pattern
Closed	marmoute	D12048 test-http-bad-server: document that the value are actually a list
Closed	marmoute	D12047 test-http-bad-server: refactor the writing logic to avoid early return
Closed	marmoute	D12046 test-http-bad-server: replace the default 65537 value in output
Closed	marmoute	D12045 test-http-bad-server: refactor the reading logic to avoid early return
Closed	marmoute	D12044 test-http-bad-server: factor code dealing with "read" in the new object
Closed	marmoute	D12043 test-http-bad-server: factor code dealing with "write" in the new object
Closed	marmoute	D12042 test-http-bad-server: unify log printing for `sendall` and `write`
Closed	marmoute	D12041 test-http-bad-server: track close condition in an object
Closed	marmoute	D12040 test-http-bad-server: use more readable name for variable
Closed	marmoute	D12039 test-http-bad-server: align output by using `;`
Closed	marmoute	D12038 test-http-bad-server: highlight each test with section
Closed	marmoute	D12037 test-http-bad-server: rename config to use `-`
Closed	marmoute	D12036 test-http-bad-server: move the extension in `testlib`
Closed	marmoute	D12035 requirements: remove the `localrepo.supportedformat` attribute
Closed	marmoute	D12034 requirements: sort _basesupported
Closed	marmoute	D12033 requirements: move the comment about manifestv2 in the module
Closed	marmoute	D12032 stream-clone: add a explicit set list requirements relevant to stream clone
Closed	marmoute	D12031 stream-clone: filter possible missing requirements using all supported one
Closed	marmoute	D12030 requirements: move "bookmark in store" requirements in the right module
Closed	marmoute	D12029 stream-clone: add a explicit test for format change during stream clone
Closed	marmoute	D12028 stream-clone: factor computation of requirement of a stream clone
Closed	marmoute	D12027 stream-clone: factor computation of new clone requirement out
Closed	marmoute	D12026 stream-clone: drop some outdated lines in test-stream-bundle-v2.t

Diff 31949

tests/test-http-bad-server.t

	readline(218 from *) -> (218) x-hgarg-1: bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtag (glob)			readline(218 from *) -> (218) x-hgarg-1: bookmarks=1&bundlecaps=HG20%2Cbundle2%3DHG20%250Abookmarks%250Achangegroup%253D01%252C02%250Adigests%253Dmd5%252Csha1%252Csha512%250Aerror%253Dabort%252Cunsupportedcontent%252Cpushraced%252Cpushkey%250Ahgtag (glob)
	read limit reached; closing socket			read limit reached; closing socket

	$ 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.close-after-recv-bytes=329,344 -p $HGPORT -d --pid-file=hg.pid -E error.log			$ hg serve \
				> --config badserver.close-after-recv-patterns="x-hgargs-post:,user-agent: mercurial/proto-1.0" \
				> --config badserver.close-after-recv-bytes="14,26" \
				> --config experimental.httppostargs=true \
				> -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: * (glob)			abort: error: bad HTTP status line: * (glob)
	[100]			[100]

	$ killdaemons.py $DAEMON_PIDS			$ killdaemons.py $DAEMON_PIDS

	$ cat error.log \| "$PYTHON" $TESTDIR/filtertraceback.py			$ cat error.log \| "$PYTHON" $TESTDIR/filtertraceback.py
	readline(329 from ~) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n			readline(~) -> (33) GET /?cmd=capabilities HTTP/1.1\r\n
	readline(296 from *) -> (27) Accept-Encoding: identity\r\n (glob)			readline(*) -> (27) Accept-Encoding: identity\r\n (glob)
	readline(269 from *) -> (35) accept: application/mercurial-0.1\r\n (glob)			readline(*) -> (35) accept: application/mercurial-0.1\r\n (glob)
	readline(234 from *) -> (2?) host: localhost:$HGPORT\r\n (glob)			readline(*) -> (2?) host: localhost:$HGPORT\r\n (glob)
	readline(* from *) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n (glob)			readline(*) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n (glob)
	readline(* from *) -> (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: 444\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: 444\r\n\r\n (py36 !)
	sendall(444) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (py36 !)			sendall(444) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs 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: 444\r\n\r\n (py3 no-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: 444\r\n\r\n (py3 no-py36 !)
	write(444) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (py3 no-py36 !)			write(444) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (py3 no-py36 !)
	write(36) -> HTTP/1.1 200 Script output follows\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(23) -> Server: badhttpserver\r\n (no-py3 !)
	write(37) -> Date: $HTTP_DATE$\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(41) -> Content-Type: application/mercurial-0.1\r\n (no-py3 !)
	write(21) -> Content-Length: 444\r\n (no-py3 !)			write(21) -> Content-Length: 444\r\n (no-py3 !)
	write(2) -> \r\n (no-py3 !)			write(2) -> \r\n (no-py3 !)
	write(444) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-py3 !)			write(444) -> batch branchmap $USUAL_BUNDLE2_CAPS_NO_PHASES$ changegroupsubset compression=none getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx httppostargs known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-py3 !)
	readline(1?? from ~) -> (27) POST /?cmd=batch HTTP/1.1\r\n (glob)			readline(~) -> (27) POST /?cmd=batch HTTP/1.1\r\n (glob)
	readline(1?? from *) -> (27) Accept-Encoding: identity\r\n (glob)			readline(*) -> (27) Accept-Encoding: identity\r\n (glob)
	readline(1?? from *) -> (41) content-type: application/mercurial-0.1\r\n (glob)			readline(*) -> (41) content-type: application/mercurial-0.1\r\n (glob)
	readline(6? from *) -> (33) vary: X-HgArgs-Post,X-HgProto-1\r\n (glob)			readline(*) -> (33) vary: X-HgArgs-Post,X-HgProto-1\r\n (glob)
	readline(3? from *) -> (19) x-hgargs-post: 28\r\n (glob)			readline(*) -> (19) x-hgargs-post: 28\r\n (glob)
	readline(1? from ) -> (1?) x-hgproto-1: (glob)			readline() -> (1?) x-hgproto-1: (glob)
	read limit reached; closing socket			read limit reached; closing socket
	readline(344 from ~) -> (27) POST /?cmd=batch HTTP/1.1\r\n			readline(~) -> (27) POST /?cmd=batch HTTP/1.1\r\n
	readline(317 from *) -> (27) Accept-Encoding: identity\r\n (glob)			readline(*) -> (27) Accept-Encoding: identity\r\n (glob)
	readline(290 from *) -> (41) content-type: application/mercurial-0.1\r\n (glob)			readline(*) -> (41) content-type: application/mercurial-0.1\r\n (glob)
	readline(249 from *) -> (33) vary: X-HgArgs-Post,X-HgProto-1\r\n (glob)			readline(*) -> (33) vary: X-HgArgs-Post,X-HgProto-1\r\n (glob)
	readline(216 from *) -> (19) x-hgargs-post: 28\r\n (glob)			readline(*) -> (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(*) -> (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(*) -> (35) accept: application/mercurial-0.1\r\n (glob)
	readline(101 from *) -> (20) content-length: 28\r\n (glob)			readline(*) -> (20) content-length: 28\r\n (glob)
	readline(81 from ) -> () host: localhost:$HGPORT\r\n (glob)			readline() -> () host: localhost:$HGPORT\r\n (glob)
	readline(* from *) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n (glob)			readline(*) -> (49) user-agent: mercurial/proto-1.0 (Mercurial 4.2)\r\n (glob)
	readline(* from *) -> (2) \r\n (glob)			readline(*) -> (2) \r\n (glob)
	read(* from 28) -> () cmds= (glob)			read(24 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 !)

	$ rm -f error.log			$ rm -f error.log