remove redundant status statement & pin the tls charm revs in the int…

…egration test
canonical · Nov 25, 2024 · 85efad3 · 85efad3
1 parent 17dee60
commit 85efad3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/src/events/tls.py b/src/events/tls.py
@@ -27,7 +27,6 @@
     RelationJoinedEvent,
 )
 from ops.framework import Object
-from ops.model import ActiveStatus
 
 from literals import TLS_RELATION, TRUSTED_CA_RELATION, TRUSTED_CERTIFICATE_RELATION, Status
 
@@ -142,8 +141,6 @@ def _trusted_relation_created(self, event: EventBase) -> None:
             self.charm.state.cluster.update({"mtls": "enabled"})
             self.charm.on.config_changed.emit()
 
-        self.charm.app.status = ActiveStatus()
-
     def _trusted_relation_joined(self, event: RelationJoinedEvent) -> None:
         """Generate a CSR so the tls-certificates operator works as expected."""
         # Once the certificates have been added, TLS setup has finished

diff --git a/tests/integration/test_tls.py b/tests/integration/test_tls.py
@@ -241,10 +241,10 @@ async def test_truststore_live_reload(ops_test: OpsTest):
     test_msg = {"test": 123456}
 
     await ops_test.model.deploy(
-        TLS_NAME, channel="stable", series="jammy", application_name="other-ca"
+        TLS_NAME, channel="stable", application_name="other-ca", revision=155
     )
     await ops_test.model.deploy(
-        TLS_REQUIRER, channel="stable", series="jammy", application_name="other-req"
+        TLS_REQUIRER, channel="stable", application_name="other-req", revision=102
     )
 
     await ops_test.model.add_relation("other-ca", "other-req")