thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-25 05:16:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1124 from kamermans/bugfix/travis-ci-errors-fix2

Browse Source 
Bugfix: Test reads from out-of-scope var
This commit is contained in:
Jason Wilder 2018-04-22 15:47:42 -06:00 committed by GitHub
commit 9521593cbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -7,7 +7,8 @@ env:
- TEST_TARGET: test-alpine - TEST_TARGET: test-alpine
before_install: before_install:
- sudo apt-get remove docker docker-engine - sudo apt-get -y remove docker docker-engine docker-ce
- sudo rm /etc/apt/sources.list.d/docker.list
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
- sudo apt-get update - sudo apt-get update

4
test/conftest.py
View File

@ -469,5 +469,5 @@ try:
except docker.errors.ImageNotFound: except docker.errors.ImageNotFound:
pytest.exit("The docker image 'jwilder/nginx-proxy:test' is missing") pytest.exit("The docker image 'jwilder/nginx-proxy:test' is missing")
if docker.__version__ != "2.0.2": if docker.__version__ != "2.1.0":
pytest.exit("This test suite is meant to work with the python docker module v2.0.2") pytest.exit("This test suite is meant to work with the python docker module v2.1.0")

4
test/requirements/python-requirements.txt
View File

@ -1,5 +1,5 @@
backoff==1.3.2 backoff==1.3.2
docker-compose==1.11.1 docker-compose==1.11.2
docker==2.0.2 docker==2.1.0
pytest==3.0.5 pytest==3.0.5
requests==2.11.1 requests==2.11.1