Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix failing unit tests with ops 1.5.3 #162

Merged
merged 1 commit into from
Oct 20, 2022
Merged

Fix failing unit tests with ops 1.5.3 #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
# see https://github.com/canonical/operator/pull/786
ops == 1.5.2 # >= 1.5.3 raises an error, potentially we are using the tests wrong
ops
ops-lib-pgsql
10 changes: 5 additions & 5 deletions tests/unit/test_charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ def test_missing_relations(self):
self.assertEqual(
self.harness.model.unit.status, WaitingStatus("Waiting for redis-broker relation")
)
redis_relation_id = self.harness.add_relation("redis", self.harness.charm.app.name)
redis_relation_id = self.harness.add_relation("redis", "redis-broker")
self.harness.add_relation_unit(redis_relation_id, "redis-broker/0")
self.harness.update_relation_data(
redis_relation_id, "redis-broker/0", {"something": "just to trigger rel-changed event"}
)
self.assertEqual(
self.harness.model.unit.status, WaitingStatus("Waiting for redis-cache relation")
)
redis_relation_id = self.harness.add_relation("redis", self.harness.charm.app.name)
redis_relation_id = self.harness.add_relation("redis", "redis-cache")
self.harness.add_relation_unit(redis_relation_id, "redis-cache/0")
self.harness.update_relation_data(
redis_relation_id, "redis-cache/0", {"something": "just to trigger rel-changed event"}
Expand Down Expand Up @@ -426,15 +426,15 @@ def test_refresh_external_resources_when_customization_and_plugins_set(self):

def set_up_all_relations(self):
self.harness.charm._stored.db_uri = "db-uri"
self.db_relation_id = self.harness.add_relation("db", self.harness.charm.app.name)
self.db_relation_id = self.harness.add_relation("db", "postgresql")
self.harness.add_relation_unit(self.db_relation_id, "postgresql/0")

self.harness.add_relation("indico-peers", self.harness.charm.app.name)

broker_relation_id = self.harness.add_relation("redis", self.harness.charm.app.name)
broker_relation_id = self.harness.add_relation("redis", "redis-broker")
self.harness.add_relation_unit(broker_relation_id, "redis-broker/0")

cache_relation_id = self.harness.add_relation("redis", self.harness.charm.app.name)
cache_relation_id = self.harness.add_relation("redis", "redis-cache")
self.harness.add_relation_unit(cache_relation_id, "redis-cache/0")

cache_relation = self.harness.model.get_relation("redis", cache_relation_id)
Expand Down