Merge lp:~thedac/charm-helpers/active-stopped-check into lp:charm-helpers

[David Ames]

service_running is returning false positives. Actively check for stopped messages and return False.

Serivces are actually down:
# initctl list |grep cinder-
cinder-volume stop/waiting
cinder-api stop/waiting
cinder-scheduler stop/waiting

But fall through systemv check shows them up:
# service --status-all 2>&1|grep cinder-
 [ + ] cinder-api
 [ + ] cinder-scheduler
 [ + ] cinder-volume

[lp:~thedac/charm-helpers/active-stopped-check]

573. By David Ames on 2016-05-13

Enhance the comment

[Alex Kavanagh (ajkavanagh)]

Looks good to me.

review: Approve

[lp:~thedac/charm-helpers/active-stopped-check]

574. By David Ames on 2016-05-13

Make service_running unit tests more robust

[Alex Kavanagh (ajkavanagh)]

Reviewed added tests. Looks good.

review: Approve

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2016-04-08 15:09:08 +0000
+++ charmhelpers/core/host.py	2016-05-13 16:30:32 +0000
@@ -152,6 +152,10 @@
             if ("start/running" in output or "is running" in output or
                     "up and running" in output):
                 return True
+            # Actively check for upstart stopped message(s) as the fall through
+            # SystemV check can return false positives
+            if ("stop/waiting" in output):
+                return False
             # Check System V scripts init script return codes
             if service_name in systemv_services_running():
                 return True

=== modified file 'tests/core/test_host.py'
--- tests/core/test_host.py	2016-04-08 13:55:23 +0000
+++ tests/core/test_host.py	2016-05-13 16:30:32 +0000
@@ -467,12 +467,15 @@
             call('restart', service_name)
         ])
 
+    @patch.object(host, 'systemv_services_running')
     @patch.object(host, 'init_is_systemd')
     @patch('subprocess.check_output')
-    def test_service_running_on_stopped_service(self, check_output, systemd):
+    def test_service_running_on_stopped_service(self, check_output, systemd,
+                                                systemv_services_running):
         systemd.return_value = False
         check_output.return_value = b'foo stop/waiting'
         self.assertFalse(host.service_running('foo'))
+        self.assertFalse(systemv_services_running.called)
 
     @patch.object(host, 'init_is_systemd')
     @patch('subprocess.check_output')
@@ -505,6 +508,7 @@
         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'))
+        self.assertTrue(systemv_services_running.called)
 
     @patch.object(host, 'systemv_services_running')
     @patch.object(host, 'init_is_systemd')
@@ -515,6 +519,7 @@
         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'))
+        self.assertTrue(systemv_services_running.called)
 
     @patch('subprocess.check_output')
     def test_systemv_services_running(self, check_output):