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

[Cory Johns]

Fixes from review.

[nicopace (nicopace)]

review: Approve

=== modified file 'tests/21-monitors-interface-test'
--- tests/21-monitors-interface-test	2015-02-04 15:27:29 +0000
+++ tests/21-monitors-interface-test	2015-03-12 17:20:33 +0000
@@ -10,6 +10,7 @@
 d.add('nagios')
 d.add('mysql')
 d.add('nrpe')
+d.add('mediawiki')
 
 d.relate('mysql:db', 'mediawiki:db')
 d.relate('nagios:monitors', 'mysql:monitors')
@@ -21,6 +22,7 @@
 
 try:
     d.setup(timeout=seconds)
+    d.sentry.wait()
 except amulet.helpers.TimeoutError:
     amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
 except:
 
=== modified file 'tests/22-extraconfig-test'
--- tests/22-extraconfig-test	2015-02-04 17:59:21 +0000
+++ tests/22-extraconfig-test	2015-03-12 17:20:33 +0000
@@ -15,6 +15,7 @@
 
 try:
     d.setup(timeout=seconds)
+    d.sentry.wait()
 except amulet.helpers.TimeoutError:
     amulet.raise_status(amulet.SKIP, msg="Environment wasn't stood up in time")
 except: