From 061915da285a3034d1b6d9cfc133c615571f0eeb Mon Sep 17 00:00:00 2001 From: Juanpe Araque Date: Tue, 12 May 2026 12:53:42 +0200 Subject: [PATCH] Replace mockserver healthcheck wait with log-based readiness in TeamCity tests --- teamcity/tests/conftest.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/teamcity/tests/conftest.py b/teamcity/tests/conftest.py index 2a6ddaa7f191b..dd94eb343d52b 100644 --- a/teamcity/tests/conftest.py +++ b/teamcity/tests/conftest.py @@ -19,18 +19,17 @@ @pytest.fixture(scope='session') def dd_environment(rest_instance, openmetrics_instance): - compose_file = COMPOSE_FILE.format('mockserver') - instance = rest_instance - endpoints = None - conditions = None if USE_OPENMETRICS: compose_file = COMPOSE_FILE.format('teamcity_server') - instance = openmetrics_instance - endpoints = [METRIC_ENDPOINT] conditions = [CheckDockerLogs('teamcity-server', ['TeamCity initialized'], attempts=100, wait=3)] + with docker_run(compose_file, endpoints=[METRIC_ENDPOINT], conditions=conditions, sleep=10): + yield openmetrics_instance + return - with docker_run(compose_file, endpoints=endpoints, conditions=conditions, sleep=10): - yield instance + compose_file = COMPOSE_FILE.format('mockserver') + conditions = [CheckDockerLogs(compose_file, ['started on port: 8111'], attempts=60, wait=2)] + with docker_run(compose_file, conditions=conditions, wait_for_health=False, sleep=2): + yield rest_instance @pytest.fixture(scope='session')