yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-12-27 09:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ingest): upgrade pytest-docker (#9765)

Browse Source
This commit is contained in:
Harshal Sheth 2024-02-01 16:33:15 -08:00 committed by GitHub
parent 533130408a
commit 0e418b527e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata-ingestion/setup.py
View File

@ -468,7 +468,7 @@ base_dev_requirements = {
pytest_dep,
"pytest-asyncio>=0.16.0",
"pytest-cov>=2.8.1",
"pytest-docker>=1.0.1",
"pytest-docker>=1.1.0",
deepdiff_dep,
"requests-mock",
"freezegun",

20
metadata-ingestion/tests/test_helpers/docker_helpers.py
View File

@ -2,7 +2,7 @@ import contextlib
import logging
import os
import subprocess
from typing import Callable, Optional, Union
from typing import Callable, Iterator, List, Optional, Union
import pytest
import pytest_docker.plugin
@ -37,9 +37,11 @@ def wait_for_port(
docker_services.wait_until_responsive(
timeout=timeout,
pause=pause,
check=checker
if checker
else lambda: is_responsive(container_name, container_port, hostname),
check=(
checker
if checker
else lambda: is_responsive(container_name, container_port, hostname)
),
)
logger.info(f"Container {container_name} is ready!")
finally:
@ -62,14 +64,16 @@ def docker_compose_runner(
):
@contextlib.contextmanager
def run(
compose_file_path: Union[str, list], key: str, cleanup: bool = True
) -> pytest_docker.plugin.Services:
compose_file_path: Union[str, List[str]], key: str, cleanup: bool = True
) -> Iterator[pytest_docker.plugin.Services]:
with pytest_docker.plugin.get_docker_services(
docker_compose_command=docker_compose_command,
docker_compose_file=compose_file_path,
# We can remove the type ignore once this is merged:
# https://github.com/avast/pytest-docker/pull/108
docker_compose_file=compose_file_path, # type: ignore
docker_compose_project_name=f"{docker_compose_project_name}-{key}",
docker_setup=docker_setup,
docker_cleanup=docker_cleanup if cleanup else False,
docker_cleanup=docker_cleanup if cleanup else [],
) as docker_services:
yield docker_services