[PATCH 3 of 3 STABLE] tests: tolerate http2
Augie Fackler
raf at durin42.com
Thu Apr 21 12:39:42 EDT 2016
On Thu, Apr 21, 2016 at 05:30:37AM +0000, timeless wrote:
> # HG changeset patch
> # User timeless <timeless at mozdev.org>
> # Date 1461213018 0
> # Thu Apr 21 04:30:18 2016 +0000
> # Branch stable
> # Node ID fff42462d9267f8fcb14780fd5e0123665436753
> # Parent ffc332df490b894efd359d2ea6a5e0066fc6d7ea
> # Available At bb://timeless/mercurial-crew
> # hg pull bb://timeless/mercurial-crew -r fff42462d926
> tests: tolerate http2
I've queued patches 1 and 3, thanks!
>
> You can run tests like this:
> run-tests.py -l --extra-config-opt ui.usehttp2=true
>
> And ideally, no tests should fail...
>
> diff -r ffc332df490b -r fff42462d926 tests/test-commandserver.t
> --- a/tests/test-commandserver.t Thu Apr 21 05:26:57 2016 +0000
> +++ b/tests/test-commandserver.t Thu Apr 21 04:30:18 2016 +0000
> @@ -182,6 +182,7 @@
> ui.slash=True
> ui.interactive=False
> ui.mergemarkers=detailed
> + ui.usehttp2=true (?)
> ui.foo=bar
> ui.nontty=true
> *** runcommand init foo
> @@ -193,6 +194,7 @@
> ui.slash=True
> ui.interactive=False
> ui.mergemarkers=detailed
> + ui.usehttp2=true (?)
> ui.nontty=true
>
> $ rm -R foo
> diff -r ffc332df490b -r fff42462d926 tests/test-http-bundle1.t
> --- a/tests/test-http-bundle1.t Thu Apr 21 05:26:57 2016 +0000
> +++ b/tests/test-http-bundle1.t Thu Apr 21 04:30:18 2016 +0000
> @@ -294,7 +294,7 @@
> "GET /?cmd=branchmap HTTP/1.1" 200 -
> "GET /?cmd=branchmap HTTP/1.1" 200 -
> "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks
> - "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524
> + "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob)
> "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases
>
> $ cd ..
> diff -r ffc332df490b -r fff42462d926 tests/test-http.t
> --- a/tests/test-http.t Thu Apr 21 05:26:57 2016 +0000
> +++ b/tests/test-http.t Thu Apr 21 04:30:18 2016 +0000
> @@ -284,7 +284,7 @@
> "GET /?cmd=branchmap HTTP/1.1" 200 -
> "GET /?cmd=branchmap HTTP/1.1" 200 -
> "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks
> - "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365
> + "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* (glob)
> "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases
>
> $ cd ..
> diff -r ffc332df490b -r fff42462d926 tests/test-treediscovery.t
> --- a/tests/test-treediscovery.t Thu Apr 21 05:26:57 2016 +0000
> +++ b/tests/test-treediscovery.t Thu Apr 21 04:30:18 2016 +0000
> @@ -528,7 +528,7 @@
> "GET /?cmd=branchmap HTTP/1.1" 200 -
> "GET /?cmd=branchmap HTTP/1.1" 200 -
> "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks
> - "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91
> + "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob)
> "GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases
> "GET /?cmd=capabilities HTTP/1.1" 200 -
> "GET /?cmd=heads HTTP/1.1" 200 -
> diff -r ffc332df490b -r fff42462d926 tests/test-unbundlehash.t
> --- a/tests/test-unbundlehash.t Thu Apr 21 05:26:57 2016 +0000
> +++ b/tests/test-unbundlehash.t Thu Apr 21 04:30:18 2016 +0000
> @@ -37,7 +37,7 @@
> The hash here is always the same since the remote repository only has the null head.
>
> $ cat access.log | grep unbundle
> - * - - [*] "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+6768033e216468247bd031a0a2d9876d79818f8f (glob)
> + * - - [*] "POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+6768033e216468247bd031a0a2d9876d79818f8f* (glob)
>
> Explicitly kill daemons to let the test exit on Windows
>
> diff -r ffc332df490b -r fff42462d926 tests/test-wireproto.t
> --- a/tests/test-wireproto.t Thu Apr 21 05:26:57 2016 +0000
> +++ b/tests/test-wireproto.t Thu Apr 21 04:30:18 2016 +0000
> @@ -39,23 +39,23 @@
> $ cat error.log
> $ cat access.log
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033* (glob)
>
> HTTP without args-in-POST:
> $ hg serve -R repo -p $HGPORT1 -d --pid-file=hg1.pid -E error.log -A access.log
> @@ -76,23 +76,23 @@
> $ cat error.log
> $ cat access.log
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:39* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:43* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:27* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:17* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033 (glob)
> - * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033 (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033* (glob)
> + * - - [*] "POST /?cmd=debugwireargs HTTP/1.1" 200 - x-hgargs-post:1033* (glob)
> * - - [*] "GET /?cmd=capabilities HTTP/1.1" 200 - (glob)
> * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=quatre&one=un&three=trois&two=deux (glob)
> * - - [*] "GET /?cmd=debugwireargs HTTP/1.1" 200 - x-hgarg-1:four=quatre&one=un&three=trois&two=deux (glob)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
More information about the Mercurial-devel
mailing list