From f1fbc475085b1d17357f273dc33e9f9664cf2b8f Mon Sep 17 00:00:00 2001 From: Adam Outler Date: Sat, 1 Nov 2025 19:04:31 +0000 Subject: [PATCH] coderabbit required fix --- test/docker_tests/test_docker_compose_scenarios.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/test/docker_tests/test_docker_compose_scenarios.py b/test/docker_tests/test_docker_compose_scenarios.py index 3dc4eee5..bbb9dd98 100644 --- a/test/docker_tests/test_docker_compose_scenarios.py +++ b/test/docker_tests/test_docker_compose_scenarios.py @@ -114,7 +114,7 @@ def _create_test_data_dirs(base_dir: pathlib.Path) -> None: conn.close() -def _run_docker_compose(compose_file: pathlib.Path, project_name: str, timeout: int = 30, env_vars: dict = None) -> subprocess.CompletedProcess: +def _run_docker_compose(compose_file: pathlib.Path, project_name: str, timeout: int = 30, env_vars: dict | None = None) -> subprocess.CompletedProcess: """Run docker compose up and capture output.""" cmd = [ "docker", "compose", @@ -125,6 +125,11 @@ def _run_docker_compose(compose_file: pathlib.Path, project_name: str, timeout: "--timeout", str(timeout) ] + # Merge custom env vars with current environment + env = os.environ.copy() + if env_vars: + env.update(env_vars) + try: result = subprocess.run( cmd, @@ -134,16 +139,17 @@ def _run_docker_compose(compose_file: pathlib.Path, project_name: str, timeout: text=True, timeout=timeout + 10, check=False, + env=env, ) except subprocess.TimeoutExpired: # Clean up on timeout subprocess.run(["docker", "compose", "-f", str(compose_file), "-p", project_name, "down", "-v"], - cwd=compose_file.parent, check=False) + cwd=compose_file.parent, check=False, env=env) raise # Always clean up subprocess.run(["docker", "compose", "-f", str(compose_file), "-p", project_name, "down", "-v"], - cwd=compose_file.parent, check=False) + cwd=compose_file.parent, check=False, env=env) # Combine stdout and stderr result.output = result.stdout + result.stderr