Skip to content

ci: silence spurious CI annotations from failed-sync-restart tests #580

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

Merged
james-garner-canonical merged 2 commits into from
Jul 17, 2026
Merged

ci: silence spurious CI annotations from failed-sync-restart tests #580

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
add50b6
Fix #520: silence spurious CI annotations from failed-sync-restart tests
tonyandrewmeyer Jun 30, 2026
aaf96bd
Merge branch 'main' into rainy/520-silence-sync-lock-test-annotations
patriciareinoso Jul 6, 2026
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
16 changes: 16 additions & 0 deletions rollingops/tests/unit/test_etcd_rollingops_in_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#
# Learn more about testing at: https://juju.is/docs/sdk/testing

import logging
from unittest.mock import MagicMock, patch

import pytest
Expand Down Expand Up @@ -501,7 +502,16 @@ def test_is_waiting_returns_false_when_no_operations_in_unit(

def test_sync_lock_request_failed_critical_path_using_etcd_lock(
ctx: Context[RollingOpsCharm],
caplog: pytest.LogCaptureFixture,
):
# The `failed-sync-restart` action deliberately raises a ValueError inside
# the lock-protected block. RollingOpsManager.acquire_sync_lock then logs
# the traceback via `logger.exception()`, which is correct production
# behaviour but, in CI, the captured traceback's `File "…", line N`
# frame gets turned into a GitHub Actions error annotation (see #520).
# Silence the manager's logger for the duration of this test.
caplog.set_level(logging.CRITICAL, logger='charmlibs.rollingops._rollingops_manager')

peer = PeerRelation(endpoint='restart')
etcd_relation = Relation(
endpoint='etcd',
Expand Down Expand Up @@ -574,7 +584,13 @@ def test_sync_lock_fallbacks_to_peer_backend_on_etcd_error(

def test_sync_lock_peer_backend_and_failure_on_critical_path_is_propagated(
ctx: Context[RollingOpsCharm],
caplog: pytest.LogCaptureFixture,
):
# See note on test_sync_lock_request_failed_critical_path_using_etcd_lock
# — the `failed-sync-restart` action's ValueError is logged by the
# manager and would otherwise surface as a spurious CI annotation (#520).
caplog.set_level(logging.CRITICAL, logger='charmlibs.rollingops._rollingops_manager')

peer = PeerRelation(endpoint='restart')
etcd_relation = Relation(
endpoint='etcd',
Expand Down
Loading