pytest-docker 3.2.1__tar.gz → 3.2.3__tar.gz

{pytest_docker-3.2.1/src/pytest_docker.egg-info → pytest_docker-3.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.1
+Version: 3.2.3
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron

{pytest_docker-3.2.1 → pytest_docker-3.2.3}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = pytest-docker
-version = 3.2.1
+version = 3.2.3
 description = Simple pytest fixtures for Docker and Docker Compose based tests
 long_description = file: README.md
 long_description_content_type = text/markdown

{pytest_docker-3.2.1 → pytest_docker-3.2.3}/src/pytest_docker/plugin.py

@@ -4,7 +4,7 @@ import re
 import subprocess
 import time
 import timeit
-from typing import Any, Dict, Iterable, Iterator, List, Tuple, Union
+from typing import Any, Dict, Iterable, Iterator, List, Optional, Tuple, Union
 
 import attr
 import pytest
@@ -46,10 +46,8 @@ def get_docker_ip() -> Union[str, Any]:
     if not docker_host or docker_host.startswith("unix://"):
         return "127.0.0.1"
 
-    match = re.match(r"^tcp://(.+?):\d+$", docker_host)
-    if not match:
-        raise ValueError('Invalid value for DOCKER_HOST: "%s".' % (docker_host,))
-    return match.group(1)
+    # Return just plain address without prefix and port
+    return re.sub(r"^[^:]+://(.+):\d+$", r"\1", docker_host)
 
 
 @pytest.fixture(scope=containers_scope)
@@ -80,7 +78,7 @@ class Services:
         """
 
         # Lookup in the cache.
-        cache: int = self._services.get(service, {}).get(container_port, None)
+        cache: Optional[int] = self._services.get(service, {}).get(container_port, None)
         if cache is not None:
             return cache
 

{pytest_docker-3.2.1 → pytest_docker-3.2.3/src/pytest_docker.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.1
+Version: 3.2.3
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron

{pytest_docker-3.2.1 → pytest_docker-3.2.3}/tests/test_docker_ip.py

@@ -23,10 +23,8 @@ def test_docker_ip_unix() -> None:
         assert get_docker_ip() == "127.0.0.1"
 
 
-@pytest.mark.parametrize("docker_host", ["http://1.2.3.4:2376"])
+@pytest.mark.parametrize("docker_host", ["http://1.2.3.4:2376", "tcp://1.2.3.4:2376"])
 def test_docker_ip_remote_invalid(docker_host: str) -> None:
     environ = {"DOCKER_HOST": docker_host}
     with mock.patch("os.environ", environ):
-        with pytest.raises(ValueError) as exc:
-            print(get_docker_ip())
-        assert str(exc.value) == ('Invalid value for DOCKER_HOST: "%s".' % (docker_host,))
+        assert get_docker_ip() == "1.2.3.4"