Skip to content

Commit

Permalink
Merge branch 'main' into feature/juju_3_6_tests
Browse files Browse the repository at this point in the history
  • Loading branch information
shayancanonical committed Nov 7, 2024
2 parents 95d869d + ef6baf7 commit 7107c2a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions tests/integration/new_relations/test_new_relations.py
Original file line number Diff line number Diff line change
Expand Up @@ -670,6 +670,7 @@ async def test_discourse(ops_test: OpsTest):


@pytest.mark.group(1)
@pytest.mark.unstable
@markers.amd64_only # indico charm not available for arm64
async def test_indico_datatabase(ops_test: OpsTest) -> None:
"""Tests deploying and relating to the Indico charm."""
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/test_charm.py
Original file line number Diff line number Diff line change
Expand Up @@ -1773,7 +1773,7 @@ def test_create_pgdata(harness):
container.exists.return_value = False
harness.charm._create_pgdata(container)
container.make_dir.assert_called_once_with(
"/var/lib/postgresql/data/pgdata", permissions=504, user="postgres", group="postgres"
"/var/lib/postgresql/data/pgdata", permissions=488, user="postgres", group="postgres"
)
container.exec.assert_called_once_with([
"chown",
Expand Down

0 comments on commit 7107c2a

Please sign in to comment.