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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.3
+Version: 3.2.5
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron
@@ -23,7 +23,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pytest<9.0,>=4.0
+Requires-Dist: pytest<10.0,>=4.0
 Requires-Dist: attrs>=19.2.0
 Provides-Extra: docker-compose-v1
 Requires-Dist: docker-compose<2.0,>=1.27.3; extra == "docker-compose-v1"
@@ -133,6 +133,10 @@ def test_status_code(http_service):
     assert response.status_code == status
 ```
 
+> The default `docker_setup` command includes `--wait`, which respects either the
+> image `HEALTHCHECK` or the compose `healthcheck`. Generally, if those
+> are configured properly, `wait_until_responsive` should not be required. 
+
 By default, this plugin will try to open `docker-compose.yml` in your
 `tests` directory. If you need to use a custom location, override the
 `docker_compose_file` fixture inside your `conftest.py` file:
@@ -177,7 +181,7 @@ def docker_compose_project_name() -> str:
 # Stop the stack before starting a new one
 @pytest.fixture(scope="session")
 def docker_setup():
-    return ["down -v", "up --build -d"]
+    return ["down -v", "up --build --wait"]
 ```
 
 

{pytest_docker-3.2.3 → pytest_docker-3.2.5}/README.md

@@ -94,6 +94,10 @@ def test_status_code(http_service):
     assert response.status_code == status
 ```
 
+> The default `docker_setup` command includes `--wait`, which respects either the
+> image `HEALTHCHECK` or the compose `healthcheck`. Generally, if those
+> are configured properly, `wait_until_responsive` should not be required. 
+
 By default, this plugin will try to open `docker-compose.yml` in your
 `tests` directory. If you need to use a custom location, override the
 `docker_compose_file` fixture inside your `conftest.py` file:
@@ -138,7 +142,7 @@ def docker_compose_project_name() -> str:
 # Stop the stack before starting a new one
 @pytest.fixture(scope="session")
 def docker_setup():
-    return ["down -v", "up --build -d"]
+    return ["down -v", "up --build --wait"]
 ```
 
 

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

@@ -1,6 +1,6 @@
 [metadata]
 name = pytest-docker
-version = 3.2.3
+version = 3.2.5
 description = Simple pytest fixtures for Docker and Docker Compose based tests
 long_description = file: README.md
 long_description_content_type = text/markdown
@@ -30,7 +30,7 @@ package_dir =
 	=src
 packages = pytest_docker
 install_requires = 
-	pytest >=4.0, <9.0
+	pytest >=4.0, <10.0
 	attrs >=19.2.0
 
 [options.extras_require]
@@ -79,6 +79,7 @@ strict = true
 mypy_path = "src/pytest_docker,tests"
 namespace_packages = true
 warn_unused_ignores = true
+warn_return_any = false
 
 [egg_info]
 tag_build = 

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

@@ -1,5 +1,6 @@
 import contextlib
 import os
+from pathlib import Path
 import re
 import subprocess
 import time
@@ -119,7 +120,7 @@ class Services:
         raise Exception("Timeout reached while waiting on service!")
 
 
-def str_to_list(arg: Union[str, List[Any], Tuple[Any]]) -> Union[List[Any], Tuple[Any]]:
+def str_to_list(arg: Union[str, Path, List[Any], Tuple[Any]]) -> Union[List[Any], Tuple[Any]]:
     if isinstance(arg, (list, tuple)):
         return arg
     return [arg]
@@ -178,7 +179,7 @@ def docker_cleanup() -> Union[List[str], str]:
 
 
 def get_setup_command() -> Union[List[str], str]:
-    return ["up --build -d"]
+    return ["up --build --wait"]
 
 
 @pytest.fixture(scope=containers_scope)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-docker
-Version: 3.2.3
+Version: 3.2.5
 Summary: Simple pytest fixtures for Docker and Docker Compose based tests
 Home-page: https://github.com/avast/pytest-docker
 Author: Max K., Andre Caron
@@ -23,7 +23,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.txt
-Requires-Dist: pytest<9.0,>=4.0
+Requires-Dist: pytest<10.0,>=4.0
 Requires-Dist: attrs>=19.2.0
 Provides-Extra: docker-compose-v1
 Requires-Dist: docker-compose<2.0,>=1.27.3; extra == "docker-compose-v1"
@@ -133,6 +133,10 @@ def test_status_code(http_service):
     assert response.status_code == status
 ```
 
+> The default `docker_setup` command includes `--wait`, which respects either the
+> image `HEALTHCHECK` or the compose `healthcheck`. Generally, if those
+> are configured properly, `wait_until_responsive` should not be required. 
+
 By default, this plugin will try to open `docker-compose.yml` in your
 `tests` directory. If you need to use a custom location, override the
 `docker_compose_file` fixture inside your `conftest.py` file:
@@ -177,7 +181,7 @@ def docker_compose_project_name() -> str:
 # Stop the stack before starting a new one
 @pytest.fixture(scope="session")
 def docker_setup():
-    return ["down -v", "up --build -d"]
+    return ["down -v", "up --build --wait"]
 ```
 
 

{pytest_docker-3.2.3 → pytest_docker-3.2.5}/src/pytest_docker.egg-info/requires.txt

@@ -1,4 +1,4 @@
-pytest<9.0,>=4.0
+pytest<10.0,>=4.0
 attrs>=19.2.0
 
 [docker-compose-v1]

{pytest_docker-3.2.3 → pytest_docker-3.2.5}/tests/test_docker_services.py

@@ -49,7 +49,7 @@ def test_docker_services() -> None:
     # Both should have been called.
     assert check_output.call_args_list == [
         mock.call(
-            'docker compose -f "docker-compose.yml" -p "pytest123" up --build -d',
+            'docker compose -f "docker-compose.yml" -p "pytest123" up --build --wait',
             stderr=subprocess.STDOUT,
             shell=True,
         ),
@@ -100,7 +100,7 @@ def test_docker_services_unused_port() -> None:
     assert check_output.call_args_list == [
         mock.call(
             'docker compose -f "docker-compose.yml" -p "pytest123" '
-            "up --build -d",  # pylint: disable:=implicit-str-concat
+            'up --build --wait',  # pylint: disable:=implicit-str-concat
             shell=True,
             stderr=subprocess.STDOUT,
         ),
@@ -147,7 +147,7 @@ def test_docker_services_failure() -> None:
     assert check_output.call_args_list == [
         mock.call(
             'docker compose -f "docker-compose.yml" -p "pytest123" '
-            "up --build -d",  # pylint: disable:=implicit-str-concat
+            "up --build --wait",  # pylint: disable:=implicit-str-concat
             shell=True,
             stderr=subprocess.STDOUT,
         )
@@ -188,7 +188,7 @@ def test_single_commands() -> None:
             "docker compose",
             "docker-compose.yml",
             docker_compose_project_name="pytest123",
-            docker_setup="up --build -d",
+            docker_setup="up --build --wait",
             docker_cleanup="down -v",
         ) as services:
             assert isinstance(services, Services)
@@ -212,7 +212,7 @@ def test_single_commands() -> None:
     # Both should have been called.
     assert check_output.call_args_list == [
         mock.call(
-            'docker compose -f "docker-compose.yml" -p "pytest123" up --build -d',
+            'docker compose -f "docker-compose.yml" -p "pytest123" up --build --wait',
             stderr=subprocess.STDOUT,
             shell=True,
         ),
@@ -242,7 +242,7 @@ def test_multiple_commands() -> None:
             "docker compose",
             "docker-compose.yml",
             docker_compose_project_name="pytest123",
-            docker_setup=["ps", "up --build -d"],
+            docker_setup=["ps", "up --build --wait"],
             docker_cleanup=["down -v", "ps"],
         ) as services:
             assert isinstance(services, Services)
@@ -271,7 +271,7 @@ def test_multiple_commands() -> None:
             shell=True,
         ),
         mock.call(
-            'docker compose -f "docker-compose.yml" -p "pytest123" up --build -d',
+            'docker compose -f "docker-compose.yml" -p "pytest123" up --build --wait',
             stderr=subprocess.STDOUT,
             shell=True,
         ),

{pytest_docker-3.2.3 → pytest_docker-3.2.5}/tests/test_dockercomposeexecutor.py

@@ -1,7 +1,7 @@
 import subprocess
 from unittest import mock
 
-import py
+from pathlib import Path
 from pytest_docker.plugin import DockerComposeExecutor
 
 
@@ -31,9 +31,9 @@ def test_execute_docker_compose_v2() -> None:
         ]
 
 
-def test_pypath_compose_files() -> None:
-    compose_file: py.path.local = py.path.local("/tmp/docker-compose.yml")
-    docker_compose = DockerComposeExecutor("docker compose", compose_file, "pytest123")  # type: ignore
+def test_path_compose_file() -> None:
+    compose_file: Path = Path("/tmp/docker-compose.yml")
+    docker_compose = DockerComposeExecutor("docker compose", compose_file, "pytest123")
     with mock.patch("subprocess.check_output") as check_output:
         docker_compose.execute("up")
         assert check_output.call_args_list == [

{pytest_docker-3.2.3 → pytest_docker-3.2.5}/tests/test_fixtures.py

@@ -21,7 +21,7 @@ def test_docker_cleanup(docker_cleanup: List[str]) -> None:
 
 
 def test_docker_setup(docker_setup: List[str]) -> None:
-    assert docker_setup == ["up --build -d"]
+    assert docker_setup == ["up --build --wait"]
 
 
 def test_docker_compose_comand(docker_compose_command: str) -> None: