Merge lp:~gandelman-a/charm-helpers/service_running into lp:charm-helpers

[Adam Gandelman]

Adds a basic service_running() util to query whether or a service is running.

[James Page (james-page)]

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2013-07-09 10:43:41 +0000
+++ charmhelpers/core/host.py	2013-07-11 17:52:24 +0000
@@ -39,6 +39,18 @@
     return subprocess.call(cmd) == 0
 
 
+def service_running(service):
+    try:
+        output = subprocess.check_output(['service', service, 'status'])
+    except subprocess.CalledProcessError:
+        return False
+    else:
+        if ("start/running" in output or "is running" in output):
+            return True
+        else:
+            return False
+
+
 def adduser(username, password=None, shell='/bin/bash', system_user=False):
     """Add a user"""
     try:

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2013-07-09 10:43:41 +0000
+++ tests/core/test_host.py	2013-07-11 17:52:24 +0000
@@ -152,6 +152,22 @@
 
         service.assert_called_with('reload', service_name)
 
+    @patch('subprocess.check_output')
+    def test_service_running_on_stopped_service(self, check_output):
+        check_output.return_value = 'foo stop/waiting'
+        self.assertFalse(host.service_running('foo'))
+
+    @patch('subprocess.check_output')
+    def test_service_running_on_running_service(self, check_output):
+        check_output.return_value = 'foo start/running, process 23871'
+        self.assertTrue(host.service_running('foo'))
+
+    @patch('subprocess.check_output')
+    def test_service_running_on_unknown_service(self, check_output):
+        exc = subprocess.CalledProcessError(1, ['status'])
+        check_output.side_effect = exc
+        self.assertFalse(host.service_running('foo'))
+
     @patch('pwd.getpwnam')
     @patch('subprocess.check_call')
     @patch.object(host, 'log')