Use pip for installing httpbin in most Travis CI builds

Using docker results in errors due to rate limit on pulling, so try to
reduce its use as much as possible. It still has to be used under Ubuntu
14.04 because it has a version of Python too old to work with HTTPS
servers using SNI and so using pip fails there.
This commit is contained in:
Vadim Zeitlin
2021-02-15 16:05:43 +01:00
parent 9dc676a32c
commit e848c54f0f
2 changed files with 4 additions and 5 deletions

View File

@@ -12,7 +12,7 @@ jobs:
include: include:
- dist: trusty - dist: trusty
compiler: gcc compiler: gcc
env: wxGTK_VERSION=2 wxUSE_XVFB=1 env: wxGTK_VERSION=2 wxUSE_XVFB=1 wxUSE_DOCKER_HTTPBIN=1
name: wxGTK 2 Ubuntu 14.04 name: wxGTK 2 Ubuntu 14.04
- dist: bionic - dist: bionic
compiler: gcc compiler: gcc

View File

@@ -16,10 +16,9 @@ launch_httpbin() {
echo 'travis_fold:start:httpbin' echo 'travis_fold:start:httpbin'
echo 'Running httpbin...' echo 'Running httpbin...'
# Prefer to use docker if it's available as it's more robust than dealing # Use docker if configured to do so, this works around Python/pip problems
# with pip -- but we need to have a fallback as at least Mac builds don't # on some platforms.
# have docker. if [ "$wxUSE_DOCKER_HTTPBIN" = 1 ]; then
if command -v docker; then
docker pull kennethreitz/httpbin docker pull kennethreitz/httpbin
docker run -d -p 80:80 kennethreitz/httpbin docker run -d -p 80:80 kennethreitz/httpbin
WX_TEST_WEBREQUEST_URL="http://localhost" WX_TEST_WEBREQUEST_URL="http://localhost"