Skip to content

[MISC] Don't block if the snap cannot be installed #1136

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
merged 1 commit into from
Sep 2, 2025
Merged

[MISC] Don't block if the snap cannot be installed #1136

Show file tree
Hide file tree
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
6 changes: 1 addition & 5 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,11 +1070,7 @@ def _on_install(self, event: InstallEvent) -> None:
self.unit.status = MaintenanceStatus("installing PostgreSQL")

# Install the charmed PostgreSQL snap.
try:
self._install_snap_packages(packages=SNAP_PACKAGES)
except snap.SnapError:
self.unit.status = BlockedStatus("failed to install snap packages")
return
self._install_snap_packages(packages=SNAP_PACKAGES)

cache = snap.SnapCache()
postgres_snap = cache[POSTGRESQL_SNAP_NAME]
Expand Down
16 changes: 0 additions & 16 deletions tests/unit/test_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,22 +134,6 @@ def test_on_install_failed_to_create_home(harness):
assert isinstance(harness.model.unit.status, WaitingStatus)


def test_on_install_snap_failure(harness):
with (
patch("charm.PostgresqlOperatorCharm._install_snap_packages") as _install_snap_packages,
patch(
"charm.PostgresqlOperatorCharm._is_storage_attached", return_value=True
) as _is_storage_attached,
):
# Mock the result of the call.
_install_snap_packages.side_effect = snap.SnapError
# Trigger the hook.
harness.charm.on.install.emit()
# Assert that the needed calls were made.
_install_snap_packages.assert_called_once()
assert isinstance(harness.model.unit.status, BlockedStatus)


def test_patroni_scrape_config_no_tls(harness):
result = harness.charm.patroni_scrape_config()

Expand Down