From 7c39d87bc97747b6a9d0b4e3e268567d5f630066 Mon Sep 17 00:00:00 2001 From: Kim Altintop Date: Wed, 13 Nov 2024 14:35:03 +0100 Subject: [PATCH] smoketests: Use docker compose logs if compose file is specified --- smoketests/__main__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/smoketests/__main__.py b/smoketests/__main__.py index 035b3e6b059..b82683aa962 100644 --- a/smoketests/__main__.py +++ b/smoketests/__main__.py @@ -57,6 +57,7 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument("test", nargs="*", default=tests) parser.add_argument("--docker", action="store_true") + parser.add_argument("--compose-file") parser.add_argument("--skip-dotnet", action="store_true", help="ignore tests which require dotnet") parser.add_argument("--show-all-output", action="store_true", help="show all stdout/stderr from the tests as they're running") parser.add_argument("--parallel", action="store_true", help="run test classes in parallel") @@ -75,9 +76,12 @@ def main(): build_template_target() if args.docker: - docker_container = check_docker() # have docker logs print concurrently with the test output - subprocess.Popen(["docker", "logs", "-f", docker_container]) + if args.compose_file: + subprocess.Popen(["docker", "compose", "-f", args.compose_file, "logs", "-f"]) + else: + docker_container = check_docker() + subprocess.Popen(["docker", "logs", "-f", docker_container]) smoketests.HAVE_DOCKER = True smoketests.new_identity(TEST_DIR / 'config.toml')