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

Proposed by Haw Loeung
Status: Merged
Approved by: Barry Price
Approved revision: 313777dc755d9a92090bdf7cc707a49b0503152a
Merged at revision: 636924eb7a70cb12070d62dd743f8d070e058a43
Proposed branch: ~hloeung/content-cache-charm:cleanup
Merge into: content-cache-charm:master
Diff against target: 13 lines (+1/-1)
1 file modified
tests/unit/test_content_cache.py (+1/-1)
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+382628@code.launchpad.net

Commit message

Fixed unit test from recent changes adding timeout

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 636924eb7a70cb12070d62dd743f8d070e058a43

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/tests/unit/test_content_cache.py b/tests/unit/test_content_cache.py
2index d52f5cb..15ef35f 100644
3--- a/tests/unit/test_content_cache.py
4+++ b/tests/unit/test_content_cache.py
5@@ -757,7 +757,7 @@ site1.local:
6 mock.call(
7 shortname='haproxy_telegraf_metrics',
8 description='Verify haproxy metrics are visible via telegraf subordinate',
9- check_cmd='/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 9103 -u /metrics -r "haproxy_rate"',
10+ check_cmd='/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 9103 -u /metrics -r "haproxy_rate" -t 20',
11 )
12 ]
13 nrpe_instance_mock.add_check.assert_has_calls(want, any_order=True)

Subscribers

People subscribed via source and target branches