Read about our upcoming Code of Conduct on this issue

Commit 7ecb1299 authored by Simon Farnsworth's avatar Simon Farnsworth
Browse files

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).
parent f746f787f82c
......@@ -71,12 +71,12 @@ Smoke testing
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 @@ Test disabling obsolete advertisement
===========================================
(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 @@ Test disabling obsolete advertisement
$ 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 @@ Test disabling obsolete advertisement
$ 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)
......@@ -75,12 +75,12 @@ Smoke testing
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
......@@ -133,14 +133,14 @@ Test disabling obsolete advertisement
===========================================
(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
......@@ -149,13 +149,13 @@ Test disabling obsolete advertisement
$ 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
......@@ -163,12 +163,12 @@ Test disabling obsolete advertisement
$ 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)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment