From 3997edda61d94bd26ed9479145270cd1e37410e0 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Fri, 28 Jun 2019 08:47:37 +0000
Subject: [PATCH] SW-699: test frombus.nr_of_messages_in_queue
---
.../python/messaging/test/t_messagebus.py | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/LCS/Messaging/python/messaging/test/t_messagebus.py b/LCS/Messaging/python/messaging/test/t_messagebus.py
index abf41a02a28..c7fe2e84532 100644
--- a/LCS/Messaging/python/messaging/test/t_messagebus.py
+++ b/LCS/Messaging/python/messaging/test/t_messagebus.py
@@ -404,8 +404,19 @@ class SendReceiveMessage(unittest.TestCase):
:return the received message
"""
with self.tobus, self.frombus:
+ self.assertEqual(0, self.frombus.nr_of_messages_in_queue())
self.tobus.send(send_msg)
+
+ # wait (a little) until the broker routed the message to the queue
+ start_wait = datetime.utcnow()
+ while self.frombus.nr_of_messages_in_queue() != 1:
+ sleep(0.05)
+ if (datetime.utcnow() - start_wait).total_seconds() > 1.0:
+ break
+
+ self.assertEqual(1, self.frombus.nr_of_messages_in_queue())
recv_msg = self.frombus.receive(timeout=TIMEOUT)
+ self.assertEqual(0, self.frombus.nr_of_messages_in_queue())
self.assertEqual(type(send_msg), type(recv_msg))
self.assertEqual(send_msg.id, recv_msg.id)
@@ -538,11 +549,11 @@ class RejectorTester(unittest.TestCase):
spammer.send(msg)
while rejector.handled_messages < number_of_messages:
- print("Handled messages: {}".format(rejector.handled_messages))
+ logger.info("Handled messages: {}".format(rejector.handled_messages))
sleep(1)
with FromBus(rejector.address) as frombus:
- print("Number of messages on queue: {}".format(frombus.nr_of_messages_in_queue()))
+ logger.info("Number of messages on queue: {}".format(frombus.nr_of_messages_in_queue()))
self.assertEqual(0, frombus.nr_of_messages_in_queue())
--
GitLab