Skip to content

Stop relying on mockserver Docker healthcheck for TeamCity test readiness #23675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AAraKKe wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −8
Open

Stop relying on mockserver Docker healthcheck for TeamCity test readiness #23675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions teamcity/tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Copy link
Copy Markdown

@chatgpt-codex-connector chatgpt-codex-connector Bot May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Remove unsupported docker_run keyword

When USE_OPENMETRICS is false, this fixture now calls docker_run(..., wait_for_health=False, ...), but the dev helper's signature is docker_run(..., waith_for_health=False, ...) and does not accept wait_for_health (confirmed via inspect.signature(datadog_checks.dev.docker_run)). As a result the legacy/mockserver TeamCity tests raise TypeError: docker_run() got an unexpected keyword argument 'wait_for_health' before starting Docker, so this path is broken instead of just bypassing the healthcheck.

Useful? React with 👍 / 👎.

Copy link
Copy Markdown
Contributor Author

@AAraKKe AAraKKe May 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this has an outdated version of the API, we already fixed this.

yield rest_instance


@pytest.fixture(scope='session')
Expand Down
Loading