Rename machine_charm.py to charm.py (#202)

Needed for upcoming charmcraft 3 migration because of canonical/charmcraft#1994
canonical · Jan 10, 2025 · 1826232 · 1826232
1 parent cf99969
commit 1826232
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -67,4 +67,4 @@ parts:
     # TODO: enable after https://github.com/canonical/charmcraft/issues/1456 fixed
     charm-strict-dependencies: false
     charm-requirements: [requirements.txt]
-    charm-entrypoint: src/machine_charm.py
+    charm-entrypoint: src/charm.py
diff --git a/src/machine_charm.py → src/charm.py b/src/machine_charm.py → src/charm.py
diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py
@@ -34,7 +34,7 @@ def disable_tenacity_retry(monkeypatch):
 @pytest.fixture(autouse=True)
 def patch(monkeypatch):
     monkeypatch.setattr(
-        "machine_charm.MachineSubordinateRouterCharm.wait_until_mysql_router_ready",
+        "charm.MachineSubordinateRouterCharm.wait_until_mysql_router_ready",
         lambda *args, **kwargs: None,
     )
     monkeypatch.setattr("workload.AuthenticatedWorkload._router_username", "")

diff --git a/tests/unit/scenario_/database_relations/test_database_relations.py b/tests/unit/scenario_/database_relations/test_database_relations.py
@@ -9,7 +9,7 @@
 import pytest
 import scenario
 
-import machine_charm
+import charm
 
 from . import combinations
 
@@ -23,7 +23,7 @@ def output_states(
 
     The output state of each test should be identical for all events.
     """
-    context = scenario.Context(machine_charm.MachineSubordinateRouterCharm)
+    context = scenario.Context(charm.MachineSubordinateRouterCharm)
     input_state = scenario.State(
         relations=[*relations, scenario.PeerRelation(endpoint="upgrade-version-a")],
         secrets=secrets,

diff --git a/tests/unit/scenario_/database_relations/test_database_relations_breaking.py b/tests/unit/scenario_/database_relations/test_database_relations_breaking.py
@@ -7,7 +7,7 @@
 import pytest
 import scenario
 
-import machine_charm
+import charm
 
 from . import combinations
 
@@ -18,7 +18,7 @@ def output_state(
     event: scenario.Event,
     secrets: list[scenario.Secret] = [],
 ) -> scenario.State:
-    context = scenario.Context(machine_charm.MachineSubordinateRouterCharm)
+    context = scenario.Context(charm.MachineSubordinateRouterCharm)
     input_state = scenario.State(
         relations=[*relations, scenario.PeerRelation(endpoint="upgrade-version-a")],
         secrets=secrets,

diff --git a/tests/unit/scenario_/test_start.py b/tests/unit/scenario_/test_start.py
@@ -5,12 +5,12 @@
 import pytest
 import scenario
 
-import machine_charm
+import charm
 
 
 @pytest.mark.parametrize("leader", [False, True])
 def test_start_sets_status_if_no_relations(leader):
-    context = scenario.Context(machine_charm.MachineSubordinateRouterCharm)
+    context = scenario.Context(charm.MachineSubordinateRouterCharm)
     input_state = scenario.State(
         leader=leader,
         relations=[scenario.PeerRelation(endpoint="upgrade-version-a")],