Skip to content

Commit d338b8d

Browse files
uncaught-except-upgrade-charm-event
1 parent c50068f commit d338b8d

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- build
3030
uses: canonical/data-platform-workflows/.github/workflows/[email protected]
3131
with:
32-
channel: dpe/edge/test-refresh-v3-uncaught-before-snap-refresh
32+
channel: dpe/edge/test-refresh-v3-uncaught-except-upgrade-charm-event
3333
artifact-prefix: ${{ needs.build.outputs.artifact-prefix }}
3434
create-git-tags: false
3535
secrets:

refresh_versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ charm_major = 1
44
workload = "8.0.41"
55

66
# autogenerated
7-
charm = "8.0/1.5.0"
7+
charm = "8.0/1.6.0"
88

99
[snap]
1010
name = "charmed-mysql"

src/charm.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import socket
1919
import typing
2020

21+
import charm_ as charm
2122
import charm_refresh
2223
import ops.log
2324
import tenacity
@@ -44,7 +45,6 @@ class _MachinesRouterRefresh(abstract_charm.RouterRefresh, charm_refresh.CharmSp
4445
def refresh_snap(
4546
self, *, snap_name: str, snap_revision: str, refresh: charm_refresh.Machines
4647
) -> None:
47-
raise Exception
4848
# TODO: issue on relation-broken event since event not passed? mitigated by regular event handler?
4949
self._charm.get_workload(event=None, refresh=refresh).refresh(
5050
event=None,
@@ -109,7 +109,8 @@ def __init__(self, *args) -> None:
109109
self._reconcile_allowed = False
110110
else:
111111
self._reconcile_allowed = True
112-
raise Exception
112+
if not isinstance(charm.event, charm.UpgradeCharmEvent):
113+
raise Exception
113114

114115
@property
115116
def _subordinate_relation_endpoint_names(self) -> typing.Optional[typing.Iterable[str]]:

0 commit comments

Comments
 (0)