Content Cache Charm

Merge ~hloeung/content-cache-charm:http2 into content-cache-charm:master

  1. Git
  2. lp:~hloeung/content-cache-charm
  3. http2
  4. Merge into master
Proposed by Haw Loeung
Status: Merged
Approved by: Barry Price
Approved revision: 1c0b8dc33db06c9c9966848a00802f8f552c30df
Merged at revision: d401afb55b07a75034308c02d0933c72bda1a4e3
Proposed branch: ~hloeung/content-cache-charm:http2
Merge into: content-cache-charm:master
Diff against target: 43 lines (+6/-6)
3 files modified
tests/unit/files/content_cache_rendered_haproxy_test_output2.txt (+2/-2)
tests/unit/files/content_cache_rendered_haproxy_test_output3.txt (+2/-2)
tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output2.txt (+2/-2)
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+382978@code.launchpad.net

Commit message

Fix unit test for HTTP/2

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
Barry Price (barryprice) wrote :

+1

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

Change successfully merged at revision d401afb55b07a75034308c02d0933c72bda1a4e3

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
2index da54095..7cf9795 100644
3--- a/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
4+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output2.txt
5@@ -64,8 +64,8 @@ listen stats
6
7
8 listen cached-site1-local
9- bind 0.0.0.0:443 ssl crt /var/lib/haproxy/certs
10- bind :::443 ssl crt /var/lib/haproxy/certs
11+ bind 0.0.0.0:443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
12+ bind :::443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
13 default_backend backend-cached-site1-local
14
15 listen site1-local
16diff --git a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
17index 7245b7b..925f62c 100644
18--- a/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
19+++ b/tests/unit/files/content_cache_rendered_haproxy_test_output3.txt
20@@ -69,8 +69,8 @@ listen redirect-site1-local
21 redirect scheme https code 301 if { hdr(Host) -i site1.local } !{ ssl_fc }
22
23 listen cached-site1-local
24- bind 0.0.0.0:443 ssl crt /var/lib/haproxy/certs
25- bind :::443 ssl crt /var/lib/haproxy/certs
26+ bind 0.0.0.0:443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
27+ bind :::443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
28 default_backend backend-cached-site1-local
29
30 listen site1-local
31diff --git a/tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output2.txt b/tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output2.txt
32index 6b484f3..b84b56e 100644
33--- a/tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output2.txt
34+++ b/tests/unit/files/haproxy_config_rendered_listen_stanzas_test_output2.txt
35@@ -5,6 +5,6 @@ listen redirect-site1-local
36 redirect scheme https code 301 if { hdr(Host) -i site1.local } !{ ssl_fc }
37
38 listen site1-local
39- bind 0.0.0.0:443 ssl crt /var/lib/haproxy/certs
40- bind :::443 ssl crt /var/lib/haproxy/certs
41+ bind 0.0.0.0:443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
42+ bind :::443 ssl crt /var/lib/haproxy/certs alpn h2,http/1.1
43 default_backend backend-site1-local

Subscribers

People subscribed via source and target branches