From f78105a6460f9338d756bab160ddf13b295627a0 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 29 Mar 2021 14:46:04 +0000
Subject: [PATCH] Allow status message to be overridden

---
 zaza/openstack/charm_tests/rabbitmq_server/tests.py |  7 +++++++
 zaza/openstack/charm_tests/test_utils.py            | 12 ++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/zaza/openstack/charm_tests/rabbitmq_server/tests.py b/zaza/openstack/charm_tests/rabbitmq_server/tests.py
index 13d0e52..c3f03fb 100644
--- a/zaza/openstack/charm_tests/rabbitmq_server/tests.py
+++ b/zaza/openstack/charm_tests/rabbitmq_server/tests.py
@@ -443,6 +443,13 @@ class RabbitMQDeferredRestartTest(test_utils.BaseDeferredRestartTest):
             restart_package_service='rabbitmq-server',
             application_name='rabbitmq-server')
 
+    def check_status_message_is_clear(self):
+        """Check each units status message show no defeerred events."""
+        for unit in zaza.model.get_units(self.application_name):
+            assert unit.workload_status_message in [
+                'Unit is ready',
+                'Unit is ready and clustered']
+
     def trigger_deferred_hook_via_charm(self):
         """Set charm config option which requires a service start.
 
diff --git a/zaza/openstack/charm_tests/test_utils.py b/zaza/openstack/charm_tests/test_utils.py
index 94ac235..dec0cd0 100644
--- a/zaza/openstack/charm_tests/test_utils.py
+++ b/zaza/openstack/charm_tests/test_utils.py
@@ -755,6 +755,12 @@ class BaseDeferredRestartTest(OpenStackBaseTest):
         super(BaseDeferredRestartTest, cls).setUpClass(
             application_name=cls.application_name)
 
+    def check_status_message_is_clear(self):
+        """Check each units status message show no defeerred events."""
+        # Check workload status no longer shows deferred restarts.
+        for unit in model.get_units(self.application_name):
+            assert unit.workload_status_message == 'Unit is ready'
+
     def check_clear_restarts(self):
         """Clear and deferred restarts and check status.
 
@@ -769,8 +775,7 @@ class BaseDeferredRestartTest(OpenStackBaseTest):
                 action_params={'deferred': True})
 
         # Check workload status no longer shows deferred restarts.
-        for unit in model.get_units(self.application_name):
-            assert unit.workload_status_message == 'Unit is ready'
+        self.check_status_message_is_clear()
 
     def check_clear_hooks(self):
         """Clear and deferred restarts and check status.
@@ -785,8 +790,7 @@ class BaseDeferredRestartTest(OpenStackBaseTest):
                 'run-deferred-hooks')
 
         # Check workload status no longer shows deferred restarts.
-        for unit in model.get_units(self.application_name):
-            assert unit.workload_status_message == 'Unit is ready'
+        self.check_status_message_is_clear()
 
     def run_show_deferred_events_action(self):
         """Run show-deferred-events and return results.