Mercurial > evolve
changeset 1243:3ffa12edc05a stable
tests: use 'wget' instead of 'curl' for Windows compatibility
The whole test suite now runs without skips, and the only two failures are a
bookmark cache issue in test-prune.t, and a local output vs remote output
reordering when pushing to ssh. The latter anyway is a core problem.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 21 Mar 2015 19:09:56 -0400 |
| parents | 5b6c42a3e12f |
| children | 3249814dabd1 |
| files | tests/test-simple4server-bundle2.t tests/test-simple4server.t |
| diffstat | 2 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-simple4server-bundle2.t Wed Apr 01 14:44:12 2015 -0700 +++ b/tests/test-simple4server-bundle2.t Sat Mar 21 19:09:56 2015 -0400 @@ -71,12 +71,12 @@ Capacity testing =================== - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon (no-eol) - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces obsolete @@ -128,14 +128,14 @@ =========================================== (used by bitbucket to select which repo use evolve) - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces obsolete phases - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon (no-eol) $ echo '[__temporary__]' >> server/.hg/hgrc @@ -144,13 +144,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 - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces phases - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 (no-eol) $ echo 'advertiseobsolete=True' >> server/.hg/hgrc @@ -158,12 +158,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 - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces obsolete phases - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream bundle2-exp=HG2Y%0Ab2x%253Achangegroup%3D01%2C02%0Ab2x%253Alistkeys%0Ab2x%253Aobsmarkers%3DV0%2CV1%0Ab2x%253Apushkey%0Ab2x%253Aremote-changegroup%3Dhttp%2Chttps%0Adigests%3Dmd5%2Csha1%2Csha512 unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon (no-eol)
--- a/tests/test-simple4server.t Wed Apr 01 14:44:12 2015 -0700 +++ b/tests/test-simple4server.t Sat Mar 21 19:09:56 2015 -0400 @@ -71,12 +71,12 @@ Capacity testing =================== - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon (no-eol) - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces obsolete @@ -129,14 +129,14 @@ =========================================== (used by bitbucket to select which repo use evolve) - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces obsolete phases - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon (no-eol) $ echo '[__temporary__]' >> server/.hg/hgrc @@ -145,13 +145,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 - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces phases - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 (no-eol) $ echo 'advertiseobsolete=True' >> server/.hg/hgrc @@ -159,12 +159,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 - $ curl --silent "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort + $ wget -q -O - "http://localhost:$HGPORT/?cmd=listkeys&namespace=namespaces" | sort bookmarks namespaces obsolete phases - $ curl --silent http://localhost:$HGPORT/?cmd=hello + $ wget -q -O - http://localhost:$HGPORT/?cmd=hello capabilities: lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon - $ curl --silent http://localhost:$HGPORT/?cmd=capabilities + $ wget -q -O - http://localhost:$HGPORT/?cmd=capabilities lookup changegroupsubset branchmap pushkey known getbundle unbundlehash batch stream unbundle=HG10GZ,HG10BZ,HG10UN httpheader=1024 _evoext_pushobsmarkers_0 _evoext_pullobsmarkers_0 _evoext_obshash_0 _evoext_getbundle_obscommon (no-eol)