Re: [PATCH evolve] tests: use curl instead of wget
On 10/25/2016 10:30 AM, Simon Farnsworth wrote: On 25/10/2016 02:34, Matt Harbison wrote: On Mon, 24 Oct 2016 09:37:27 -0400, Simon Farnsworth wrote: […] Would you like me to do a v2 of the patch summarizing this discussion and linking to that page in the commit message? Since I doubt many (any?) people run the tests on Windows, I don't have a problem with switching back, if how to install curl is documented on the page describing how to run tests on Windows. I forget if I made similar changes in core Mercurial. This is the only test suite I run on macOS that uses wget - I run most of the core test suite, so I'd notice if it needed wget. Core have some special logic to use the one tool it can find. Eg: https://www.mercurial-scm.org/repo/hg/rev/e278fc8bb0c3 As Jun suggested, we should probably get a small tool available to test tool. -- Pierre-Yves David ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH evolve] tests: use curl instead of wget
It sounds like the case that an additional abstraction could solve. I think it may be worthwhile to add a thin shell script choosing whatever available to use under "tests/". It could define a shell function (could be just "wget" and implement it using curl), and tests can source it. Excerpts from Simon Farnsworth's message of 2016-10-24 14:37:27 +0100: > On 24/10/2016 14:32, Pierre-Yves David wrote: > > > > > > On 10/24/2016 03:26 PM, Simon Farnsworth wrote: > >> # HG changeset patch > >> # User Simon Farnsworth > >> # Date 1477315431 25200 > >> # Mon Oct 24 06:23:51 2016 -0700 > >> # Branch stable > >> # Node ID 5fbaca977cd43dfd806a3f452543ef0ed4a4732e > >> # 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. > > > > Hum, 4e7da688a066 and 3ffa12edc05a who did the exact opposite 1.5 year > > ago. Can you have a look at them and come back with a plan that fits > > both need? > > > > I've looked at the commits you referenced, and there's not enough > context for me to understand why Matt switched from cURL (works on Linux > and macOS by default, needs a package installed on Windows as far as I > understand it), to wget (needs a package installed on Windows and macOS > as far as I understand it). > > Can you give me context for why you took these two commits? > > > > >> 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_obsco
Re: [PATCH evolve] tests: use curl instead of wget
On 25/10/2016 12:57, Matt Harbison wrote: OT: is there a blog or something somewhere that describes how you guys (or any other enterprises) get the developer's system setup and configured? Things like .hgrc settings, installing and configuring toolchains, staging build scripts, etc. I think I've read some of Greg's about how Mozilla does it, and we're basically trying to solve the same problems. There's nothing detailed out in the public domain; however, it's not a secret that we use chef for all our system configuration, including deciding which packages to install, and putting /etc/mercurial in place on developer systems. In turn, we build an in-house Mercurial package that bundles up all our extensions and Mercurial itself into a nice atomic lump for chef to play with. -- Simon Farnsworth ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH evolve] tests: use curl instead of wget
> On Oct 25, 2016, at 4:30 AM, Simon Farnsworth wrote: > >> On 25/10/2016 02:34, Matt Harbison wrote: >> On Mon, 24 Oct 2016 09:37:27 -0400, Simon Farnsworth >> wrote: >> On 24/10/2016 14:32, Pierre-Yves David wrote: > On 10/24/2016 03:26 PM, Simon Farnsworth wrote: > # HG changeset patch > # User Simon Farnsworth > # Date 1477315431 25200 > # Mon Oct 24 06:23:51 2016 -0700 > # Branch stable > # Node ID 5fbaca977cd43dfd806a3f452543ef0ed4a4732e > # 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. Hum, 4e7da688a066 and 3ffa12edc05a who did the exact opposite 1.5 year ago. Can you have a look at them and come back with a plan that fits both need? >>> >>> I've looked at the commits you referenced, and there's not enough >>> context for me to understand why Matt switched from cURL (works on >>> Linux and macOS by default, needs a package installed on Windows as >>> far as I understand it), to wget (needs a package installed on Windows >>> and macOS as far as I understand it). >>> >>> Can you give me context for why you took these two commits? >> >> I didn't get a chance to see if wget was installed on previous versions >> of OS X before leaving work today, but I don't recall ever having >> installed it on 10.6 or 10.10. So maybe that's something new with 10.12? > > I've just checked a 10.10 VM and a 10.11 system, and those did not have wget > installed, either (but they did have curl). I can't go back further easily. > > Google tells me that wget is not preinstalled on 10.6 Snow Leopard, either > (http://apple.stackexchange.com/questions/12665/how-do-i-get-wget-for-snow-leopard > for example); I suspect that you had manually installed wget on your Macs. > >> The reason I switched was because wget is available with msys, but curl >> isn't. I dug up some Windows build of curl a few months ago, but don't >> recall where. Maybe it's still in my browser history at work. I seem >> to have a /mingw/bin/curl on my home system, and vaguely remember >> building that from source a long time ago. > It looks like msys doesn't provide curl, but the download "wizard" at > https://curl.haxx.se/download.html has current Windows builds listed next to > Cygwin builds. I can't try it at the moment, but that seems easy enough. > Would you like me to do a v2 of the patch summarizing this discussion and > linking to that page in the commit message? Yes, please. It's probably worth putting on the wiki page too (I don't have time to find it now, but I vaguely remember one on how to install msys to run the tests on Windows). I wouldn't necessarily look in the history if I see a command is missing, but if it's on that page when setting up a new system, the problem is avoided entirely. >> Since I doubt many (any?) people run the tests on Windows, I don't have >> a problem with switching back, if how to install curl is documented on >> the page describing how to run tests on Windows. I forget if I made >> similar changes in core Mercurial. > > This is the only test suite I run on macOS that uses wget - I run most of the > core test suite, so I'd notice if it needed wget. The reason this has become > an issue is that I'm shifting from manual builds to automatic builds of the > Facebook internal package (which bundles up Mercurial, some extensions, and > our configs for our users), and I want to minimise the work we have to do to > keep the automatic builds working. OT: is there a blog or something somewhere that describes how you guys (or any other enterprises) get the developer's system setup and configured? Things like .hgrc settings, installing and configuring toolchains, staging build scripts, etc. I think I've read some of Greg's about how Mozilla does it, and we're basically trying to solve the same problems. > -- > Simon Farnsworth ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH evolve] tests: use curl instead of wget
On 25/10/2016 02:34, Matt Harbison wrote: On Mon, 24 Oct 2016 09:37:27 -0400, Simon Farnsworth wrote: On 24/10/2016 14:32, Pierre-Yves David wrote: On 10/24/2016 03:26 PM, Simon Farnsworth wrote: # HG changeset patch # User Simon Farnsworth # Date 1477315431 25200 # Mon Oct 24 06:23:51 2016 -0700 # Branch stable # Node ID 5fbaca977cd43dfd806a3f452543ef0ed4a4732e # 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. Hum, 4e7da688a066 and 3ffa12edc05a who did the exact opposite 1.5 year ago. Can you have a look at them and come back with a plan that fits both need? I've looked at the commits you referenced, and there's not enough context for me to understand why Matt switched from cURL (works on Linux and macOS by default, needs a package installed on Windows as far as I understand it), to wget (needs a package installed on Windows and macOS as far as I understand it). Can you give me context for why you took these two commits? I didn't get a chance to see if wget was installed on previous versions of OS X before leaving work today, but I don't recall ever having installed it on 10.6 or 10.10. So maybe that's something new with 10.12? I've just checked a 10.10 VM and a 10.11 system, and those did not have wget installed, either (but they did have curl). I can't go back further easily. Google tells me that wget is not preinstalled on 10.6 Snow Leopard, either (http://apple.stackexchange.com/questions/12665/how-do-i-get-wget-for-snow-leopard for example); I suspect that you had manually installed wget on your Macs. The reason I switched was because wget is available with msys, but curl isn't. I dug up some Windows build of curl a few months ago, but don't recall where. Maybe it's still in my browser history at work. I seem to have a /mingw/bin/curl on my home system, and vaguely remember building that from source a long time ago. It looks like msys doesn't provide curl, but the download "wizard" at https://curl.haxx.se/download.html has current Windows builds listed next to Cygwin builds. Would you like me to do a v2 of the patch summarizing this discussion and linking to that page in the commit message? Since I doubt many (any?) people run the tests on Windows, I don't have a problem with switching back, if how to install curl is documented on the page describing how to run tests on Windows. I forget if I made similar changes in core Mercurial. This is the only test suite I run on macOS that uses wget - I run most of the core test suite, so I'd notice if it needed wget. The reason this has become an issue is that I'm shifting from manual builds to automatic builds of the Facebook internal package (which bundles up Mercurial, some extensions, and our configs for our users), and I want to minimise the work we have to do to keep the automatic builds working. -- Simon Farnsworth ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH evolve] tests: use curl instead of wget
On Mon, 24 Oct 2016 09:37:27 -0400, Simon Farnsworth wrote: On 24/10/2016 14:32, Pierre-Yves David wrote: On 10/24/2016 03:26 PM, Simon Farnsworth wrote: # HG changeset patch # User Simon Farnsworth # Date 1477315431 25200 # Mon Oct 24 06:23:51 2016 -0700 # Branch stable # Node ID 5fbaca977cd43dfd806a3f452543ef0ed4a4732e # 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. Hum, 4e7da688a066 and 3ffa12edc05a who did the exact opposite 1.5 year ago. Can you have a look at them and come back with a plan that fits both need? I've looked at the commits you referenced, and there's not enough context for me to understand why Matt switched from cURL (works on Linux and macOS by default, needs a package installed on Windows as far as I understand it), to wget (needs a package installed on Windows and macOS as far as I understand it). Can you give me context for why you took these two commits? I didn't get a chance to see if wget was installed on previous versions of OS X before leaving work today, but I don't recall ever having installed it on 10.6 or 10.10. So maybe that's something new with 10.12? The reason I switched was because wget is available with msys, but curl isn't. I dug up some Windows build of curl a few months ago, but don't recall where. Maybe it's still in my browser history at work. I seem to have a /mingw/bin/curl on my home system, and vaguely remember building that from source a long time ago. Since I doubt many (any?) people run the tests on Windows, I don't have a problem with switching back, if how to install curl is documented on the page describing how to run tests on Windows. I forget if I made similar changes in core Mercurial. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
Re: [PATCH evolve] tests: use curl instead of wget
On 24/10/2016 14:32, Pierre-Yves David wrote: On 10/24/2016 03:26 PM, Simon Farnsworth wrote: # HG changeset patch # User Simon Farnsworth # Date 1477315431 25200 # Mon Oct 24 06:23:51 2016 -0700 # Branch stable # Node ID 5fbaca977cd43dfd806a3f452543ef0ed4a4732e # 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. Hum, 4e7da688a066 and 3ffa12edc05a who did the exact opposite 1.5 year ago. Can you have a look at them and come back with a plan that fits both need? I've looked at the commits you referenced, and there's not enough context for me to understand why Matt switched from cURL (works on Linux and macOS by default, needs a package installed on Windows as far as I understand it), to wget (needs a package installed on Windows and macOS as far as I understand it). Can you give me context for why you took these two commits? 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=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=DesF8_W89UXCaJo3gHu4hF5AQTlgK8eV_wP-UyTEsns&e= + $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=DesF8_W89UXCaJo3gHu4hF5AQTlgK8eV_wP-UyTEsns&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=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=FvjM7sVt9NyPcthiIFzLTjIbezUtsP4Di9PpsfBwVAk&e= + $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabilities&d=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=FvjM7sVt9NyPcthiIFzLTjIbezUtsP4Di9PpsfBwVAk&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=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=8DDabWdNhDRmKdDCh432QwB_9SEAzDiTb3D0cgeDTZo&e= " | sort + $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=8DDabWdNhDRmKdDCh432QwB_9SEAzDiTb3D0cgeDTZo&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=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=8DDabWdNhDRmKdDCh432QwB_9SEAzDiTb3D0cgeDTZo&e= " | sort + $ curl -s "https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dlistkeys-26namespace-3Dnamespaces&d=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=8DDabWdNhDRmKdDCh432QwB_9SEAzDiTb3D0cgeDTZo&e= " | sort bookmarks namespaces obsolete phases - $ wget -q -O - https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=DesF8_W89UXCaJo3gHu4hF5AQTlgK8eV_wP-UyTEsns&e= + $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dhello&d=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=DesF8_W89UXCaJo3gHu4hF5AQTlgK8eV_wP-UyTEsns&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=DQICaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=mEgSWILcY4c4W3zjApBQLA&m=TRqRXJPnl1Xu5WCYWcngUdPHt38RiF9mKDvzm0QciU8&s=FvjM7sVt9NyPcthiIFzLTjIbezUtsP4Di9PpsfBwVAk&e= + $ curl -s https://urldefense.proofpoint.com/v2/url?u=http-3A__localhost-3A-24HGPORT_-3Fcmd-3Dcapabili
Re: [PATCH evolve] tests: use curl instead of wget
On 10/24/2016 03:26 PM, Simon Farnsworth wrote: # HG changeset patch # User Simon Farnsworth # Date 1477315431 25200 # Mon Oct 24 06:23:51 2016 -0700 # Branch stable # Node ID 5fbaca977cd43dfd806a3f452543ef0ed4a4732e # 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. Hum, 4e7da688a066 and 3ffa12edc05a who did the exact opposite 1.5 year ago. Can you have a look at them and come back with a plan that fits both need? Thanks. 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
[PATCH evolve] tests: use curl instead of wget
# HG changeset patch # User Simon Farnsworth # Date 1477315431 25200 # Mon Oct 24 06:23:51 2016 -0700 # Branch stable # Node ID 5fbaca977cd43dfd806a3f452543ef0ed4a4732e # 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. 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
