Merge lp:~gnuoy/charm-helpers/sysv-service-running into lp:charm-helpers

[Liam Young]

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2016-03-02 13:55:54 +0000
+++ charmhelpers/core/host.py	2016-04-01 13:11:41 +0000
@@ -128,6 +128,13 @@
     return subprocess.call(cmd) == 0
 
 
+def systemv_services_running():
+    output = subprocess.check_output(
+        ['service', '--status-all'],
+        stderr=subprocess.STDOUT).decode('UTF-8')
+    return [row.split()[-1] for row in output.split('\n') if '[ + ]' in row]
+
+
 def service_running(service_name):
     """Determine whether a system service is running"""
     if init_is_systemd():
@@ -140,11 +147,15 @@
         except subprocess.CalledProcessError:
             return False
         else:
+            # This works for upstart scripts where the 'service' command
+            # returns a consistent string to represent running 'start/running'
             if ("start/running" in output or "is running" in output or
                     "up and running" in output):
                 return True
-            else:
-                return False
+            # Check System V scripts init script return codes
+            if service_name in systemv_services_running():
+                return True
+            return False
 
 
 def service_available(service_name):

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2016-01-20 09:43:17 +0000
+++ tests/core/test_host.py	2016-04-01 13:11:41 +0000
@@ -60,6 +60,13 @@
 link/ether 08:00:27:16:b9:5f brd ff:ff:ff:ff:ff:ff
 """
 
+SERVICE_STATUS_ALL = b"""
+ [ + ]  rabbitmq-server
+ [ ? ]  rc.local
+ [ + ]  resolvconf
+ [ - ]  rsync
+"""
+
 
 class HelpersTest(TestCase):
 
@@ -489,6 +496,34 @@
         check_output.side_effect = exc
         self.assertFalse(host.service_running('foo'))
 
+    @patch.object(host, 'systemv_services_running')
+    @patch.object(host, 'init_is_systemd')
+    @patch('subprocess.check_output')
+    def test_service_systemv_running(self, check_output, systemd,
+                                     systemv_services_running):
+        systemd.return_value = False
+        check_output.return_value = b' * Unhelpfull guff, thanks a lot rabbit'
+        systemv_services_running.return_value = [u'udev', u'rabbitmq-server']
+        self.assertTrue(host.service_running('rabbitmq-server'))
+
+    @patch.object(host, 'systemv_services_running')
+    @patch.object(host, 'init_is_systemd')
+    @patch('subprocess.check_output')
+    def test_service_systemv_not_running(self, check_output, systemd,
+                                         systemv_services_running):
+        systemd.return_value = False
+        check_output.return_value = b' * Unhelpfull guff, thanks a lot rabbit'
+        systemv_services_running.return_value = [u'udev', u'rabbitmq-server']
+        self.assertFalse(host.service_running('keystone'))
+
+    @patch('subprocess.check_output')
+    def test_systemv_services_running(self, check_output):
+        check_output.return_value = SERVICE_STATUS_ALL
+        self.assertEqual(
+            host.systemv_services_running(),
+            [u'rabbitmq-server', u'resolvconf']
+        )
+
     @patch('grp.getgrnam')
     @patch('pwd.getpwnam')
     @patch('subprocess.check_call')