Merge ~cjwatson/squid-reverseproxy-charm:fix-tests-for-squid4 into squid-reverseproxy-charm:master

Proposed by Colin Watson
Status: Merged
Approved by: Haw Loeung
Approved revision: 5fa41b889a51db60ecccad01c648aa386de4178c
Merged at revision: 8626a112795976f19d73f6e3546f15fccc975dc0
Proposed branch: ~cjwatson/squid-reverseproxy-charm:fix-tests-for-squid4
Merge into: squid-reverseproxy-charm:master
Diff against target: 14 lines (+2/-1)
1 file modified
hooks/tests/test_helpers.py (+2/-1)
Reviewer Review Type Date Requested Status
Haw Loeung +1 Approve
Canonical IS Reviewers Pending
Review via email: mp+447681@code.launchpad.net

Commit message

Fix tests for recent squid4 changes

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
Haw Loeung (hloeung) wrote :

LGTM

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

Change successfully merged at revision 8626a112795976f19d73f6e3546f15fccc975dc0

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/tests/test_helpers.py b/hooks/tests/test_helpers.py
2index 0f91738..4dc0b57 100644
3--- a/hooks/tests/test_helpers.py
4+++ b/hooks/tests/test_helpers.py
5@@ -485,7 +485,8 @@ class SquidConfigTest(TestCase):
6 self.get_reverse_sites.return_value = None
7 self.write_squid3_config.side_effect = self._assert_contents(
8 """
9- https_port 443 accel vhost cert=/path/to/cert key=/path/to/key
10+ https_port 443 accel vhost
11+ tls-cert=/path/to/cert tls-key=/path/to/key
12 """,
13 )
14 hooks.construct_squid3_config()

Subscribers

People subscribed via source and target branches

to all changes: