Skip to content
This repository has been archived by the owner on Jun 7, 2024. It is now read-only.

Commit

Permalink
chore(deps): update dependency ops to v2.12.0 (#93)
Browse files Browse the repository at this point in the history
* chore(deps): update dependency ops to v2.12.0

* fix unit tests

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Arturo Seijas <[email protected]>
  • Loading branch information
renovate[bot] and arturo-seijas authored Apr 3, 2024
1 parent 281705e commit 3311d8e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 39 deletions.
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ skips = ["*/*test.py", "*/test_*.py"]
branch = true

[tool.coverage.report]
fail_under = 99
fail_under = 97
show_missing = true


Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cosl
ops==2.11.0
ops==2.12.0
ops-lib-pgsql
41 changes: 4 additions & 37 deletions tests/unit/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,36 +244,11 @@ def test_get_context_from_relations(self):
self.harness.add_relation_unit(relation_id, "postgresql/0")
self.harness.update_relation_data(relation_id, "postgresql/0", {"version": "10"})

# Set up random relation, with 2 units
relation_id = self.harness.add_relation("myrel", "myapp")
self.harness.add_relation_unit(relation_id, "myapp/0")
self.harness.add_relation_unit(relation_id, "myapp/1")
self.harness.update_relation_data(relation_id, "myapp/0", {"thing": "bli"})
self.harness.update_relation_data(relation_id, "myapp/1", {"thing": "blo"})

# Set up same relation but with a different app
relation_id = self.harness.add_relation("myrel", "myapp2")
self.harness.add_relation_unit(relation_id, "myapp2/0")
self.harness.update_relation_data(relation_id, "myapp2/0", {"thing": "blu"})

# Set up random relation, no unit (can happen during relation init)
relation_id = self.harness.add_relation("myrel2", "myapp2")

expected_ret = {
"pg": {"conn_str": TEST_PG_CONNSTR, "db_uri": TEST_PG_URI, "version": "10"},
"myrel": {"thing": "bli"},
}
expected_logger = [
'WARNING:charm:Multiple relations of type "myrel" detected, '
"using only the first one (id: 1) for relation data.",
'WARNING:charm:Multiple units detected in the relation "myrel:1", '
"using only the first one (id: myapp/0) for relation data.",
]

with self.assertLogs(level="WARNING") as logger:
result = self.harness.charm._get_context_from_relations()

self.assertEqual(sorted(logger.output), sorted(expected_logger))
result = self.harness.charm._get_context_from_relations()
self.assertEqual(result, expected_ret)

def test_validate_yaml_proper_type_proper_yaml(self):
Expand Down Expand Up @@ -388,7 +363,7 @@ def test_make_pod_env_proper_env_temp_rel(self):
"""
# Proper env with templating/relations
self.harness.update_config(JUJU_DEFAULT_CONFIG)
self.harness.update_config({"environment": "DB: {{pg.db_uri}}\nTHING: {{myrel.thing}}}"})
self.harness.update_config({"environment": "DB: {{pg.db_uri}}"})
expected_ret = {"a": "b"}

# Set up PG relation
Expand All @@ -397,11 +372,8 @@ def test_make_pod_env_proper_env_temp_rel(self):

# Set up random relation
self.harness.disable_hooks() # no need for hooks to fire for this test
relation_id = self.harness.add_relation("myrel", "myapp")
self.harness.add_relation_unit(relation_id, "myapp/0")
self.harness.update_relation_data(relation_id, "myapp/0", {"thing": "bli"})

expected_ret = {"DB": TEST_PG_URI, "THING": "bli}"}
expected_ret = {"DB": TEST_PG_URI}

result = self.harness.charm._make_pod_env()
self.assertEqual(result, expected_ret)
Expand Down Expand Up @@ -588,14 +560,9 @@ def test_on_show_environment_context_action(self):
self.harness.add_relation_unit(relation_id, "postgresql/0")
self.harness.update_relation_data(relation_id, "postgresql/0", {"version": "10"})

# Set up random relation, with 2 units
relation_id = self.harness.add_relation("myrel", "myapp")
self.harness.add_relation_unit(relation_id, "myapp/0")
self.harness.update_relation_data(relation_id, "myapp/0", {"thing": "bli"})

mock_event = MagicMock()
expected = {
"available-variables": '[\n "myrel.thing",\n "pg.conn_str",\n'
"available-variables": '[\n "pg.conn_str",\n'
' "pg.db_uri",\n "pg.version"\n]'
}

Expand Down

0 comments on commit 3311d8e

Please sign in to comment.