Merge ~axino/charm-k8s-gunicorn/+git/charm-k8s-gunicorn:axino into charm-k8s-gunicorn:master

Proposed by Junien F
Status: Merged
Approved by: Tom Haddon
Approved revision: b3f467ccadcb16cbf159d37888ab41134d15ab11
Merged at revision: 259c64fe86f219e68a0b4ab67151eaa5216d18ce
Proposed branch: ~axino/charm-k8s-gunicorn/+git/charm-k8s-gunicorn:axino
Merge into: charm-k8s-gunicorn:master
Diff against target: 12 lines (+1/-1)
1 file modified
tests/unit/test_charm.py (+1/-1)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
🤖 prod-jenkaas-is (community) continuous-integration Approve
Canonical IS Reviewers Pending
Review via email: mp+399578@code.launchpad.net

Commit message

tests/unit/test_charm.py : fix mocking _leader_get from ops-lib-pgsql

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

A CI job is currently in progress. A follow up comment will be added when it completes.

Revision history for this message
🤖 prod-jenkaas-is (prod-jenkaas-is) wrote :

PASSED: Continuous integration, rev:b3f467ccadcb16cbf159d37888ab41134d15ab11
https://jenkins.canonical.com/is/job/lp-charm-k8s-gunicorn-ci/2/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/is/job/lp-charm-test/28/
    None: https://jenkins.canonical.com/is/job/lp-update-mp/26837/

Click here to trigger a rebuild:
https://jenkins.canonical.com/is/job/lp-charm-k8s-gunicorn-ci/2//rebuild

review: Approve (continuous-integration)
Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM, thx

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 259c64fe86f219e68a0b4ab67151eaa5216d18ce

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
2index 35581bf..746dbd3 100755
3--- a/tests/unit/test_charm.py
4+++ b/tests/unit/test_charm.py
5@@ -322,7 +322,7 @@ class TestGunicornK8sCharm(unittest.TestCase):
6
7 self.assertEqual(str(exc.exception), expected_exception)
8
9- @patch('pgsql.pgsql._leader_get')
10+ @patch('pgsql.client._leader_get')
11 def test_configure_pod(self, mock_leader_get):
12 """Test the pod configuration."""
13

Subscribers

People subscribed via source and target branches

to all changes: