Fix unit tests

Signed-off-by: Marcelo Henrique Neppel <marcelo.neppel@canonical.com>

Author: marceloneppel

src/charm.py

@@ -20,13 +20,10 @@
 from typing import Literal, get_args
 from urllib.parse import urlparse
 
-import charm_refresh
-
 from authorisation_rules_observer import (
     AuthorisationRulesChangeCharmEvents,
     AuthorisationRulesObserver,
 )
-from refresh import PostgreSQLRefresh
 
 # First platform-specific import, will fail on wrong architecture
 try:
@@ -43,6 +40,7 @@
         main(WrongArchitectureWarningCharm, use_juju_for_storage=True)
     raise
 
+import charm_refresh
 from charms.data_platform_libs.v0.data_interfaces import DataPeerData, DataPeerUnitData
 from charms.data_platform_libs.v1.data_models import TypedCharmBase
 from charms.grafana_k8s.v0.grafana_dashboard import GrafanaDashboardProvider
@@ -146,6 +144,7 @@
 )
 from ldap import PostgreSQLLDAP
 from patroni import NotReadyError, Patroni, SwitchoverFailedError, SwitchoverNotSyncError
+from refresh import PostgreSQLRefresh
 from relations.async_replication import (
     REPLICATION_CONSUMER_RELATION,
     REPLICATION_OFFER_RELATION,

tests/unit/conftest.py

@@ -19,39 +19,22 @@ def disable_charm_tracing():
         yield
 
 
-# class _MockRefresh:
-#     in_progress = False
-#     next_unit_allowed_to_refresh = True
-#     workload_allowed_to_start = True
-#     app_status_higher_priority = None
-#     unit_status_higher_priority = None
-#
-#     def __init__(self, _, /):
-#         pass
-#
-#     def unit_status_lower_priority(self, *, workload_is_running=True):
-#         return None
-
-
-# @pytest.fixture(autouse=True)
-# def patch(monkeypatch):
-#     monkeypatch.setattr("charm_refresh.Kubernetes", _MockRefresh)
-
-
 @pytest.fixture(autouse=True)
 def mock_refresh():
     """Fixture to shunt refresh logic and events."""
     refresh_mock = Mock()
     refresh_mock.in_progress = False
+    refresh_mock.app_status_higher_priority = None
+    refresh_mock.app_status_lower_priority.return_value = None
     refresh_mock.unit_status_higher_priority = None
     refresh_mock.unit_status_lower_priority.return_value = None
     refresh_mock.next_unit_allowed_to_refresh = True
     refresh_mock.workload_allowed_to_start = True
 
     # Mock the _RefreshVersions class to avoid KeyError when charm key is missing
     versions_mock = Mock()
-    versions_mock.charm = "v1/4.0.0"
-    versions_mock.workload = "4.0.0"
+    versions_mock.charm = "v1/16.0.0"
+    versions_mock.workload = "16.10"
 
     with (
         patch("charm_refresh.Kubernetes", Mock(return_value=refresh_mock)),

tests/unit/test_arch_utils.py

@@ -25,6 +25,7 @@ def test_on_module_not_found_error(monkeypatch):
         # If psycopg2 not there, charm should check architecture
         monkeypatch.delitem(sys.modules, "psycopg2", raising=False)
         monkeypatch.delitem(sys.modules, "charm", raising=False)
+        monkeypatch.delitem(sys.modules, "charm_refresh", raising=False)
         monkeypatch.setattr(builtins, "__import__", psycopg2_not_found)
         with pytest.raises(ModuleNotFoundError):
             import charm

tests/unit/test_async_replication.py

@@ -49,7 +49,7 @@ def test_on_async_relation_broken(harness, is_leader, relation_name):
     with (
         patch("charm.PostgresqlOperatorCharm.update_config") as _update_config,
         patch(
-            "relations.async_replication.PostgreSQLAsyncReplication._set_app_status"
+            "relations.async_replication.PostgreSQLAsyncReplication.set_app_status"
         ) as _set_app_status,
         patch("charm.Patroni.get_standby_leader") as _get_standby_leader,
         patch(

tests/unit/test_tls.py

@@ -17,8 +17,8 @@ def harness():
         harness = Harness(PostgresqlOperatorCharm)
 
         # Set up the initial relation and hooks.
-        peer_rel_id = harness.add_relation(PEER, "postgresql")
-        harness.add_relation_unit(peer_rel_id, "postgresql/0")
+        peer_rel_id = harness.add_relation(PEER, "postgresql-k8s")
+        harness.add_relation_unit(peer_rel_id, "postgresql-k8s/0")
         harness.begin()
         yield harness
         harness.cleanup()

tests/unit/test_tls_transfer.py

@@ -18,8 +18,8 @@ def harness():
     harness = Harness(PostgresqlOperatorCharm)
 
     # Set up the initial relation and hooks.
-    peer_rel_id = harness.add_relation(PEER, "postgresql")
-    harness.add_relation_unit(peer_rel_id, "postgresql/0")
+    peer_rel_id = harness.add_relation(PEER, "postgresql-k8s")
+    harness.add_relation_unit(peer_rel_id, "postgresql-k8s/0")
     harness.begin()
     yield harness
     harness.cleanup()