Skip to content

Commit 1826232

Browse files
Rename machine_charm.py to charm.py (#202)
Needed for upcoming charmcraft 3 migration because of canonical/charmcraft#1994
1 parent cf99969 commit 1826232

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

charmcraft.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,4 +67,4 @@ parts:
6767
# TODO: enable after https://github.com/canonical/charmcraft/issues/1456 fixed
6868
charm-strict-dependencies: false
6969
charm-requirements: [requirements.txt]
70-
charm-entrypoint: src/machine_charm.py
70+
charm-entrypoint: src/charm.py
File renamed without changes.

tests/unit/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def disable_tenacity_retry(monkeypatch):
3434
@pytest.fixture(autouse=True)
3535
def patch(monkeypatch):
3636
monkeypatch.setattr(
37-
"machine_charm.MachineSubordinateRouterCharm.wait_until_mysql_router_ready",
37+
"charm.MachineSubordinateRouterCharm.wait_until_mysql_router_ready",
3838
lambda *args, **kwargs: None,
3939
)
4040
monkeypatch.setattr("workload.AuthenticatedWorkload._router_username", "")

tests/unit/scenario_/database_relations/test_database_relations.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import pytest
1010
import scenario
1111

12-
import machine_charm
12+
import charm
1313

1414
from . import combinations
1515

@@ -23,7 +23,7 @@ def output_states(
2323
2424
The output state of each test should be identical for all events.
2525
"""
26-
context = scenario.Context(machine_charm.MachineSubordinateRouterCharm)
26+
context = scenario.Context(charm.MachineSubordinateRouterCharm)
2727
input_state = scenario.State(
2828
relations=[*relations, scenario.PeerRelation(endpoint="upgrade-version-a")],
2929
secrets=secrets,

tests/unit/scenario_/database_relations/test_database_relations_breaking.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import pytest
88
import scenario
99

10-
import machine_charm
10+
import charm
1111

1212
from . import combinations
1313

@@ -18,7 +18,7 @@ def output_state(
1818
event: scenario.Event,
1919
secrets: list[scenario.Secret] = [],
2020
) -> scenario.State:
21-
context = scenario.Context(machine_charm.MachineSubordinateRouterCharm)
21+
context = scenario.Context(charm.MachineSubordinateRouterCharm)
2222
input_state = scenario.State(
2323
relations=[*relations, scenario.PeerRelation(endpoint="upgrade-version-a")],
2424
secrets=secrets,

tests/unit/scenario_/test_start.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import pytest
66
import scenario
77

8-
import machine_charm
8+
import charm
99

1010

1111
@pytest.mark.parametrize("leader", [False, True])
1212
def test_start_sets_status_if_no_relations(leader):
13-
context = scenario.Context(machine_charm.MachineSubordinateRouterCharm)
13+
context = scenario.Context(charm.MachineSubordinateRouterCharm)
1414
input_state = scenario.State(
1515
leader=leader,
1616
relations=[scenario.PeerRelation(endpoint="upgrade-version-a")],

0 commit comments

Comments
 (0)