From 83e4ca7247bed8950bab2f93b5bfd1cadcd775b1 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Mon, 24 Jun 2019 17:14:00 +0200
Subject: [PATCH] Ensure we use pgrep >= bionic-stein

---
 zaza/openstack/charm_tests/neutron/tests.py | 17 ++++++++++++++--
 zaza/openstack/charm_tests/test_utils.py    | 22 +++++++++++++++------
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/zaza/openstack/charm_tests/neutron/tests.py b/zaza/openstack/charm_tests/neutron/tests.py
index 1699d85..8657e4b 100644
--- a/zaza/openstack/charm_tests/neutron/tests.py
+++ b/zaza/openstack/charm_tests/neutron/tests.py
@@ -54,13 +54,19 @@ class NeutronApiTest(test_utils.OpenStackBaseTest):
         # Make config change, check for service restarts
         logging.info(
             'Setting verbose on neutron-api {}'.format(set_alternate))
+        bionic_stein = openstack_utils.get_os_release('bionic_stein')
+        if openstack_utils.get_os_release() >= bionic_stein:
+            pgrep_full = True
+        else:
+            pgrep_full = False
         self.restart_on_changed(
             conf_file,
             set_default,
             set_alternate,
             default_entry,
             alternate_entry,
-            ['neutron-server'])
+            ['neutron-server'],
+            pgrep_full=pgrep_full)
 
     def test_901_pause_resume(self):
         """Run pause and resume tests.
@@ -68,7 +74,14 @@ class NeutronApiTest(test_utils.OpenStackBaseTest):
         Pause service and check services are stopped then resume and check
         they are started
         """
-        with self.pause_resume(["neutron-server", "apache2", "haproxy"]):
+        bionic_stein = openstack_utils.get_os_release('bionic_stein')
+        if openstack_utils.get_os_release() >= bionic_stein:
+            pgrep_full = True
+        else:
+            pgrep_full = False
+        with self.pause_resume(
+                ["neutron-server", "apache2", "haproxy"],
+                pgrep_full=pgrep_full):
             logging.info("Testing pause resume")
 
 
diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py
index b9eba4f..30fba45 100644
--- a/zaza/openstack/charm_tests/test_utils.py
+++ b/zaza/openstack/charm_tests/test_utils.py
@@ -168,7 +168,7 @@ class OpenStackBaseTest(unittest.TestCase):
         model.block_until_all_units_idle()
 
     def restart_on_changed(self, config_file, default_config, alternate_config,
-                           default_entry, alternate_entry, services):
+                           default_entry, alternate_entry, services, pgrep_full=False):
         """Run restart on change tests.
 
         Test that changing config results in config file being updates and
@@ -189,6 +189,9 @@ class OpenStackBaseTest(unittest.TestCase):
         :param services: Services expected to be restarted when config_file is
                          changed.
         :type services: list
+        :param pgrep_full: Should pgrep be used rather than pidof to identify
+                           a service.
+        :type  pgrep_full: bool
         """
         # lead_unit is only useed to grab a timestamp, the assumption being
         # that all the units times are in sync.
@@ -215,7 +218,8 @@ class OpenStackBaseTest(unittest.TestCase):
                 self.application_name,
                 mtime,
                 services,
-                model_name=self.model_name)
+                model_name=self.model_name,
+                pgrep_full=pgrep_full)
 
         logging.debug(
             'Waiting for updates to propagate to '.format(config_file))
@@ -226,7 +230,7 @@ class OpenStackBaseTest(unittest.TestCase):
             model_name=self.model_name)
 
     @contextlib.contextmanager
-    def pause_resume(self, services):
+    def pause_resume(self, services, pgrep_full=False):
         """Run Pause and resume tests.
 
         Pause and then resume a unit checking that services are in the
@@ -235,12 +239,16 @@ class OpenStackBaseTest(unittest.TestCase):
         :param services: Services expected to be restarted when config_file is
                          changed.
         :type services: list
+        :param pgrep_full: Should pgrep be used rather than pidof to identify
+                           a service.
+        :type  pgrep_full: bool
         """
         model.block_until_service_status(
             self.lead_unit,
             services,
             'running',
-            model_name=self.model_name)
+            model_name=self.model_name,
+            pgrep_full=pgrep_full)
         model.block_until_unit_wl_status(
             self.lead_unit,
             'active',
@@ -258,7 +266,8 @@ class OpenStackBaseTest(unittest.TestCase):
             self.lead_unit,
             services,
             'stopped',
-            model_name=self.model_name)
+            model_name=self.model_name,
+            pgrep_full=pgrep_full)
         yield
         model.run_action(
             self.lead_unit,
@@ -273,4 +282,5 @@ class OpenStackBaseTest(unittest.TestCase):
             self.lead_unit,
             services,
             'running',
-            model_name=self.model_name)
+            model_name=self.model_name,
+            pgrep_full=pgrep_full)