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 branch 'master' into feature_ssl_improvement

Browse Source
This commit is contained in:
Steve Kamerman 2017-03-08 10:49:02 -05:00 committed by GitHub
commit e373a5199b
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/test_dockergen/test_dockergen_v3.py
View File

@ -5,13 +5,26 @@ import pytest
import re import re
def versiontuple(v): def versiontuple(v):
# Temporary hack to fix version parsing until PR#755 is pulled """
v = re.sub("[^\d\.]", "", v) >>> versiontuple("1.12.3")
return tuple(map(int, (v.split(".")))) (1, 12, 3)
docker_version = docker.from_env().version()['Version'] >>> versiontuple("1.13.0")
pytestmark = pytest.mark.skipif(versiontuple(docker_version) < versiontuple('1.13'), (1, 13, 0)
reason="Docker compose syntax v3 requires docker engine v1.13")
>>> versiontuple("17.03.0-ce")
(17, 3, 0)
>>> versiontuple("17.03.0-ce") < (1, 13)
False
"""
return tuple(map(int, (v.split('-')[0].split("."))))
raw_version = docker.from_env().version()['Version']
pytestmark = pytest.mark.skipif(
versiontuple(raw_version) < (1, 13),
reason="Docker compose syntax v3 requires docker engine v1.13 or later (got %s)" % raw_version)
@pytest.yield_fixture(scope="module") @pytest.yield_fixture(scope="module")
@ -46,3 +59,8 @@ def test_forwards_to_whoami(nginx_tmpl, docker_compose, nginxproxy):
assert r.status_code == 200 assert r.status_code == 200
whoami_container = docker_compose.containers.get("whoami") whoami_container = docker_compose.containers.get("whoami")
assert r.text == "I'm %s\n" % whoami_container.id[:12] assert r.text == "I'm %s\n" % whoami_container.id[:12]
if __name__ == '__main__':
import doctest
doctest.testmod()