|
@@ -1,11 +1,11 @@
|
|
|
import docker
|
|
|
import pytest
|
|
|
-from distutils.version import LooseVersion
|
|
|
+from packaging.version import Version
|
|
|
|
|
|
|
|
|
raw_version = docker.from_env().version()["Version"]
|
|
|
pytestmark = pytest.mark.skipif(
|
|
|
- LooseVersion(raw_version) < LooseVersion("1.13"),
|
|
|
+ Version(raw_version) < Version("1.13"),
|
|
|
reason="Docker compose syntax v3 requires docker engine v1.13 or later (got {raw_version})"
|
|
|
)
|
|
|
|
|
@@ -16,9 +16,9 @@ def test_unknown_virtual_host_is_503(docker_compose, nginxproxy):
|
|
|
|
|
|
|
|
|
def test_forwards_to_whoami(docker_compose, nginxproxy):
|
|
|
- r = nginxproxy.get("http://whoami.nginx.container.docker/")
|
|
|
+ r = nginxproxy.get("http://whoami2.nginx.container.docker/")
|
|
|
assert r.status_code == 200
|
|
|
- whoami_container = docker_compose.containers.get("whoami")
|
|
|
+ whoami_container = docker_compose.containers.get("whoami2")
|
|
|
assert r.text == f"I'm {whoami_container.id[:12]}\n"
|
|
|
|
|
|
|