Juju Charms Collection
nagios package

Merge lp:~johnsca/charms/trusty/nagios/all-tests into lp:~nicopace/charms/trusty/nagios/all-tests

  1. Trusty Tahr (14.04)
  2. all-tests
  3. Merge into all-tests
Proposed by Cory Johns
Status: Merged
Merge reported by: nicopace
Merged at revision: not available
Proposed branch: lp:~johnsca/charms/trusty/nagios/all-tests
Merge into: lp:~nicopace/charms/trusty/nagios/all-tests
Diff against target: 31 lines (+3/-0)
2 files modified
tests/21-monitors-interface-test (+2/-0)
tests/22-extraconfig-test (+1/-0)
To merge this branch: bzr merge lp:~johnsca/charms/trusty/nagios/all-tests
Reviewer Review Type Date Requested Status
nicopace Approve
Review via email: mp+252786@code.launchpad.net

Description of the change

Fixes from review.

To post a comment you must log in.
Revision history for this message
nicopace (nicopace) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/21-monitors-interface-test'
2--- tests/21-monitors-interface-test 2015-02-04 15:27:29 +0000
3+++ tests/21-monitors-interface-test 2015-03-12 17:20:33 +0000
4@@ -10,6 +10,7 @@
5 d.add('nagios')
6 d.add('mysql')
7 d.add('nrpe')
8+d.add('mediawiki')
9
10 d.relate('mysql:db', 'mediawiki:db')
11 d.relate('nagios:monitors', 'mysql:monitors')
12@@ -21,6 +22,7 @@
13
14 try:
15 d.setup(timeout=seconds)
16+ d.sentry.wait()
17 except amulet.helpers.TimeoutError:
18 amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
19 except:
20
21=== modified file 'tests/22-extraconfig-test'
22--- tests/22-extraconfig-test 2015-02-04 17:59:21 +0000
23+++ tests/22-extraconfig-test 2015-03-12 17:20:33 +0000
24@@ -15,6 +15,7 @@
25
26 try:
27 d.setup(timeout=seconds)
28+ d.sentry.wait()
29 except amulet.helpers.TimeoutError:
30 amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
31 except:

Subscribers

People subscribed via source and target branches

to all changes: