Merge lp:~thedac/charm-helpers/percona-cluster-message into lp:charm-helpers

[David Ames]

Fix Bug#1535917
The check in service_running on systemv was failing to account for percona cluster's unique status message:
 * Percona XtraDB Cluster up and running

[James Page (james-page)]

Please can we have a unit test for this as well but other than that +1

review: Needs Fixing

[James Page (james-page)]

In the interests of expediency I wrote the unit test as part of landing this change!

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2016-01-15 17:16:17 +0000
+++ charmhelpers/core/host.py	2016-01-19 21:56:07 +0000
@@ -138,7 +138,8 @@
         except subprocess.CalledProcessError:
             return False
         else:
-            if ("start/running" in output or "is running" in output):
+            if ("start/running" in output or "is running" in output or
+                    "up and running" in output):
                 return True
             else:
                 return False