From 85efad37c0fb34c2e62af21d7c2afc70f930caa5 Mon Sep 17 00:00:00 2001 From: Iman Enami Date: Mon, 25 Nov 2024 16:38:55 +0400 Subject: [PATCH] remove redundant status statement & pin the tls charm revs in the integration test --- src/events/tls.py | 3 --- tests/integration/test_tls.py | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/events/tls.py b/src/events/tls.py index f825bb89..9c564161 100644 --- 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 index 3bd7054a..5226ec47 100644 --- 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")