From ce18b4a2a0f9a7dab002ea77e7f78bc26c01b6d6 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 14 Dec 2021 11:09:41 +0000
Subject: [PATCH] Fix reraising for RmqNoMessageException

---
 zaza/openstack/charm_tests/rabbitmq_server/tests.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/zaza/openstack/charm_tests/rabbitmq_server/tests.py b/zaza/openstack/charm_tests/rabbitmq_server/tests.py
index 9901270..b35817f 100644
--- a/zaza/openstack/charm_tests/rabbitmq_server/tests.py
+++ b/zaza/openstack/charm_tests/rabbitmq_server/tests.py
@@ -49,6 +49,7 @@ class RmqTests(test_utils.OpenStackBaseTest):
         return '[{}-{}]'.format(uuid.uuid4(), time.time())
 
     @tenacity.retry(
+        reraise=True,
         retry=tenacity.retry_if_exception_type(RmqNoMessageException),
         wait=tenacity.wait_fixed(10),
         stop=tenacity.stop_after_attempt(2))
@@ -75,7 +76,7 @@ class RmqTests(test_utils.OpenStackBaseTest):
         :type port: Union[int, None]
         :param amqp_msg_counter: Number in test sequence of this message.
         :type amqp_msg: int
-        :raises: tenacity.RetryError
+        :raises: RmqNoMessageException
         """
         amqp_msg_rcvd = self._retry_get_amqp_message(
             check_unit,
@@ -158,7 +159,7 @@ class RmqTests(test_utils.OpenStackBaseTest):
                         ssl,
                         port,
                         amqp_msg_counter)
-                except tenacity.RetryError:
+                except RmqNoMessageException:
                     msg = 'Message {} not found.'.format(amqp_msg_counter)
                     raise Exception(msg)
                 amqp_msg_counter += 1