Patchwork [evolve,v2] tests: use curl instead of wget

login
register
mail settings
Submitter Simon Farnsworth
Date Oct. 25, 2016, 12:23 p.m.
Message ID <f65f9acac6c69e6f2eb9.1477398222@devvm022.lla2.facebook.com>
Download mbox | patch
Permalink /patch/17190/
State Accepted
Headers show

Comments

Simon Farnsworth - Oct. 25, 2016, 12:23 p.m.
# HG changeset patch
# User Simon Farnsworth <simonfar@fb.com>
# Date 1477397752 25200
#      Tue Oct 25 05:15:52 2016 -0700
# Branch stable
# Node ID f65f9acac6c69e6f2eb90b2ed9b51d818a046f67
# Parent  970a4c13ebc320a034bc0aff21e0ef0a84157a92
tests: use curl instead of wget

curl is supplied by default on macOS 10.12, but wget isn't. As curl is easy
to install on other OSes, just switch the tests over.

For Windows systems, you can obtain cURL from
https://curl.haxx.se/download.html - for other systems, please use your
native package manager.

This undoes 4e7da688a066 and 3ffa12edc05a, as they don't make things much
simpler on Windows (you have to install extra packages either way round),
but they do make things harder on macOS (as curl is supplied by default,
whereas wget isn't).
Simon Farnsworth - Oct. 25, 2016, 12:25 p.m.
As well as the extended commit message, I've also edited 
https://www.mercurial-scm.org/wiki/HackableMercurial which was the only 
wiki page I found mentioning msys. I don't know Windows well enough to 
actually get it right, though (things appear to have changed a bit since 
NT 3.51).

Simon

On 25/10/2016 13:23, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth <simonfar@fb.com>
> # Date 1477397752 25200
> #      Tue Oct 25 05:15:52 2016 -0700
> # Branch stable
> # Node ID f65f9acac6c69e6f2eb90b2ed9b51d818a046f67
> # Parent  970a4c13ebc320a034bc0aff21e0ef0a84157a92
> tests: use curl instead of wget
>
> curl is supplied by default on macOS 10.12, but wget isn't. As curl is easy
> to install on other OSes, just switch the tests over.
>
> For Windows systems, you can obtain cURL from
> https://urldefense.proofpoint.com/v2/url?u=https-3A__curl.haxx.se_download.html&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=RNJmt18FdGmAqHoKFoP0YdwtpdWeV9vll-MZwSCIk24&e=  - for other systems, please use your
> native package manager.
>
> This undoes 4e7da688a066 and 3ffa12edc05a, as they don't make things much
> simpler on Windows (you have to install extra packages either way round),
> but they do make things harder on macOS (as curl is supplied by default,
> whereas wget isn't).
>
> diff --git a/tests/test-simple4server-bundle2.t b/tests/test-simple4server-bundle2.t
> --- a/tests/test-simple4server-bundle2.t
> +++ b/tests/test-simple4server-bundle2.t
> @@ -71,12 +71,12 @@
>  Capacity testing
>  ===================
>
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
>    capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
>    * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    obsolete	
> @@ -128,14 +128,14 @@
>  ===========================================
>  (used by bitbucket to select which repo use evolve)
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    obsolete	
>    phases	
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
>    capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
>    * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
>
>    $ echo '[__temporary__]' >> server/.hg/hgrc
> @@ -144,7 +144,7 @@
>    $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
>    $ cat hg.pid >> $DAEMON_PIDS
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    phases	
> @@ -154,13 +154,13 @@
>    $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
>    $ cat hg.pid >> $DAEMON_PIDS
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    obsolete	
>    phases	
>
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
>    capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
>    * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
> diff --git a/tests/test-simple4server.t b/tests/test-simple4server.t
> --- a/tests/test-simple4server.t
> +++ b/tests/test-simple4server.t
> @@ -73,12 +73,12 @@
>  Capacity testing
>  ===================
>
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
>    capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
>    * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    obsolete	
> @@ -131,14 +131,14 @@
>  ===========================================
>  (used by bitbucket to select which repo use evolve)
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    obsolete	
>    phases	
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
>    capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
>    * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
>
>    $ echo '[__temporary__]' >> server/.hg/hgrc
> @@ -147,13 +147,13 @@
>    $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
>    $ cat hg.pid >> $DAEMON_PIDS
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    phases	
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=  | grep _evoext_pushobsmarkers_0
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=  | grep _evoext_pushobsmarkers_0
>    [1]
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=  | grep _evoext_pushobsmarkers_0
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=  | grep _evoext_pushobsmarkers_0
>    [1]
>
>    $ echo 'advertiseobsolete=True' >> server/.hg/hgrc
> @@ -161,12 +161,12 @@
>    $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
>    $ cat hg.pid >> $DAEMON_PIDS
>
> -  $ wget -q -O - "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
> +  $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=x4s8JJyZEPf1dxyp2EdY-aVjRGZ1mxwgKOD40Uc3VhM&e= " | sort
>    bookmarks	
>    namespaces	
>    obsolete	
>    phases	
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=8iUVs0V0ElXtCkjkG1Z7w2c3t4YljF--qG-P8hSAQSo&e=
>    capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
> -  $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
> +  $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=S7W0pW9SHkDd5RGx6ImgpzkDEgimNJVZYEN6RQQXllw&e=
>    * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DQIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=xpCZbhnEotl-MEx3cSrK8Bq-4nzxq9NGPFZsnbO9v2s&s=jiyDcm8D5TWPX-6KIoA3qr8OJlEBQoOuurknv6P6NaI&e=
>
Pierre-Yves David - Oct. 28, 2016, 8:53 a.m.
On 10/25/2016 02:23 PM, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth <simonfar@fb.com>
> # Date 1477397752 25200
> #      Tue Oct 25 05:15:52 2016 -0700
> # Branch stable
> # Node ID f65f9acac6c69e6f2eb90b2ed9b51d818a046f67
> # Parent  970a4c13ebc320a034bc0aff21e0ef0a84157a92
> tests: use curl instead of wget

Matt (Harbison) can you confirm you are okay with this change before I 
take it?

Cheers,
Matt Harbison - Oct. 28, 2016, 11:51 a.m.
> On Oct 28, 2016, at 4:53 AM, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote:
> 
> 
> 
>> On 10/25/2016 02:23 PM, Simon Farnsworth wrote:
>> # HG changeset patch
>> # User Simon Farnsworth <simonfar@fb.com>
>> # Date 1477397752 25200
>> #      Tue Oct 25 05:15:52 2016 -0700
>> # Branch stable
>> # Node ID f65f9acac6c69e6f2eb90b2ed9b51d818a046f67
>> # Parent  970a4c13ebc320a034bc0aff21e0ef0a84157a92
>> tests: use curl instead of wget
> 
> Matt (Harbison) can you confirm you are okay with this change before I take it?

If it's possible to dynamically switch between tools, that's obviously better.  But I don't have a problem accepting this for short term convenience.

> Cheers,
> 
> -- 
> Pierre-Yves David
Pierre-Yves David - Nov. 2, 2016, 2:29 p.m.
On 10/28/2016 01:51 PM, Matt Harbison wrote:
>
>> On Oct 28, 2016, at 4:53 AM, Pierre-Yves David <pierre-yves.david@ens-lyon.org> wrote:
>>
>>
>>
>>> On 10/25/2016 02:23 PM, Simon Farnsworth wrote:
>>> # HG changeset patch
>>> # User Simon Farnsworth <simonfar@fb.com>
>>> # Date 1477397752 25200
>>> #      Tue Oct 25 05:15:52 2016 -0700
>>> # Branch stable
>>> # Node ID f65f9acac6c69e6f2eb90b2ed9b51d818a046f67
>>> # Parent  970a4c13ebc320a034bc0aff21e0ef0a84157a92
>>> tests: use curl instead of wget
>>
>> Matt (Harbison) can you confirm you are okay with this change before I take it?
>
> If it's possible to dynamically switch between tools, that's obviously better.  But I don't have a problem accepting this for short term convenience.

Gah, I forgot to push that one before 5.5. I've pushed it now

Cheers,

Patch

diff --git a/tests/test-simple4server-bundle2.t b/tests/test-simple4server-bundle2.t
--- a/tests/test-simple4server-bundle2.t
+++ b/tests/test-simple4server-bundle2.t
@@ -71,12 +71,12 @@ 
 Capacity testing
 ===================
 
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=hello
+  $ curl -s http://localhost:$HGPORT/?cmd=hello
   capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities
+  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
   * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   obsolete	
@@ -128,14 +128,14 @@ 
 ===========================================
 (used by bitbucket to select which repo use evolve)
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   obsolete	
   phases	
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=hello
+  $ curl -s http://localhost:$HGPORT/?cmd=hello
   capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities
+  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
   * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
 
   $ echo '[__temporary__]' >> server/.hg/hgrc
@@ -144,7 +144,7 @@ 
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   phases	
@@ -154,13 +154,13 @@ 
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   obsolete	
   phases	
 
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=hello
+  $ curl -s http://localhost:$HGPORT/?cmd=hello
   capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities
+  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
   * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
diff --git a/tests/test-simple4server.t b/tests/test-simple4server.t
--- a/tests/test-simple4server.t
+++ b/tests/test-simple4server.t
@@ -73,12 +73,12 @@ 
 Capacity testing
 ===================
 
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=hello
+  $ curl -s http://localhost:$HGPORT/?cmd=hello
   capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities
+  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
   * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   obsolete	
@@ -131,14 +131,14 @@ 
 ===========================================
 (used by bitbucket to select which repo use evolve)
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   obsolete	
   phases	
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=hello
+  $ curl -s http://localhost:$HGPORT/?cmd=hello
   capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities
+  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
   * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)
 
   $ echo '[__temporary__]' >> server/.hg/hgrc
@@ -147,13 +147,13 @@ 
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   phases	
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=hello | grep _evoext_pushobsmarkers_0
+  $ curl -s http://localhost:$HGPORT/?cmd=hello | grep _evoext_pushobsmarkers_0
   [1]
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities | grep _evoext_pushobsmarkers_0
+  $ curl -s http://localhost:$HGPORT/?cmd=capabilities | grep _evoext_pushobsmarkers_0
   [1]
 
   $ echo 'advertiseobsolete=True' >> server/.hg/hgrc
@@ -161,12 +161,12 @@ 
   $ hg serve -R server -n test -p $HGPORT -d --pid-file=hg.pid -A access.log -E errors.log
   $ cat hg.pid >> $DAEMON_PIDS
 
-  $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
+  $ curl -s "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort
   bookmarks	
   namespaces	
   obsolete	
   phases	
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=hello
+  $ curl -s http://localhost:$HGPORT/?cmd=hello
   capabilities: * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (glob)
-  $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities
+  $ curl -s http://localhost:$HGPORT/?cmd=capabilities
   * _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_obshash_1 _evoext_getbundle_obscommon (no-eol) (glob)