From 5ac4bfcbf9f8bb4bee8af18f4e60a8b7e3235ed5 Mon Sep 17 00:00:00 2001 From: "daniel.radl" Date: Mon, 14 Jul 2025 18:59:43 +0200 Subject: [PATCH] Revert "temprary debugging changes" This reverts commit d01931064d236cd9f61fdbaf695c39ba3fce20a5. --- tests/conftest.py | 32 ++++++++------------------------ 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index aa43e1f9..d6a2942b 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -150,32 +150,16 @@ def s3_service(python_path: str, compose: Compose): ) subprocess.check_call(cmd) - # Instead of using compose.exec, use subprocess.run to capture output - print("=== ATTEMPTING TO CREATE S3 BUCKET ===") - - # Build the full docker compose command - docker_cmd = [ - "docker", "compose", "-p", compose.project_name, - "--env-file", f"/tmp/pytest-of-runner/pytest-0/frappe-docker0/.env", - "-f", "compose.yaml", - "-f", "overrides/compose.proxy.yaml", - "-f", "overrides/compose.mariadb.yaml", - "-f", "overrides/compose.redis.yaml", - "-f", "tests/compose.ci.yaml", - "exec", "-T", - "-e", f"S3_ACCESS_KEY={access_key}", - "-e", f"S3_SECRET_KEY={secret_key}", + compose("cp", "tests/_create_bucket.py", "backend:/tmp") + compose.exec( + "-e", + f"S3_ACCESS_KEY={access_key}", + "-e", + f"S3_SECRET_KEY={secret_key}", "backend", python_path, - "/tmp/_create_bucket.py" - ] - - # Run with output capture - result = subprocess.run(docker_cmd, capture_output=True, text=True) - - print(f"Return code: {result.returncode}") - print(f"STDOUT:\n{result.stdout}") - print(f"STDERR:\n{result.stderr}") + "/tmp/_create_bucket.py", + ) yield S3ServiceResult(access_key=access_key, secret_key=secret_key) subprocess.call(("docker", "rm", "minio", "-f"))