Merge lp:~mthaddon/mojo/remove-check-juju into lp:mojo/mojo-specs

[Tom Haddon]

Mojo now supports a "juju-check-wait" phase, which confirms the environment has reached a steady state and that juju status is clean. Update fonts.u.c and mojo.c.c specs to use that.

[lp:~mthaddon/mojo/remove-check-juju]

16. By Tom Haddon on 2015-12-21

Also need to remove from juju-intro

[Laurent Sesquès (sajoupa)]

looks good.

review: Approve

=== modified file 'font-ubuntu-com/manifest-verify'
--- font-ubuntu-com/manifest-verify	2015-11-27 13:16:34 +0000
+++ font-ubuntu-com/manifest-verify	2015-12-21 09:52:48 +0000
@@ -1,4 +1,4 @@
 # Check juju
-verify config=scripts/check-juju
+juju-check-wait
 # The service is up and running, let's verify it
 verify config=scripts/verify-nrpe
 
=== removed symlink 'font-ubuntu-com/scripts/check-juju'
=== target was u'../../mojo-spec-helpers/tests/check-juju'
=== removed symlink 'juju-intro/check-juju'
=== target was u'../mojo-spec-helpers/tests/check-juju'
=== modified file 'juju-intro/manifest-verify'
--- juju-intro/manifest-verify	2015-09-08 08:23:46 +0000
+++ juju-intro/manifest-verify	2015-12-21 09:52:48 +0000
@@ -1,4 +1,4 @@
 # Checking juju status
-verify config=check-juju
+juju-check-wait
 # Running all naigos checks to confirm service is working as expected
 verify config=verify-nrpe
 
=== removed symlink 'mojo-how-to/check-juju'
=== target was u'../mojo-spec-helpers/tests/check-juju'
=== modified file 'mojo-how-to/manifest-verify'
--- mojo-how-to/manifest-verify	2015-09-03 06:57:32 +0000
+++ mojo-how-to/manifest-verify	2015-12-21 09:52:48 +0000
@@ -1,4 +1,4 @@
 # Check juju
-verify config=check-juju
+juju-check-wait
 # The service is up and running, let's verify it
 verify config=verify-nrpe
 
=== removed file 'mojo-spec-helpers/tests/check-juju'
--- mojo-spec-helpers/tests/check-juju	2015-09-03 06:32:08 +0000
+++ mojo-spec-helpers/tests/check-juju	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#!/usr/bin/python
-import utils.mojo_utils as mojo_utils
-
-mojo_utils.juju_check_hooks_complete()
-mojo_utils.juju_status_check_and_wait()