From adfb7ea6fc5ac1b103be6d850ad985aea035c191 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 11 Jan 2016 21:23:13 +0000
Subject: [PATCH] Task #8899: Disable auto-connect for all tests to allow tests
for invalid broker addresses.
---
LCS/Messaging/python/messaging/test/t_messagebus.py | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/LCS/Messaging/python/messaging/test/t_messagebus.py b/LCS/Messaging/python/messaging/test/t_messagebus.py
index 1e861c17b3e..5c86702dba1 100644
--- a/LCS/Messaging/python/messaging/test/t_messagebus.py
+++ b/LCS/Messaging/python/messaging/test/t_messagebus.py
@@ -35,6 +35,9 @@ from lofar.messaging.exceptions import MessageBusError, InvalidMessage
TIMEOUT = 1.0
+# Disable auto reconnect to test behaviour w.r.t. invalid addresses
+DEFAULT_BROKER_OPTIONS['reconnect'] = False
+
# ======== FromBus unit tests ======== #
@@ -171,18 +174,11 @@ class ToBusInitFailed(unittest.TestCase):
"""
Connecting to broker on wrong port must raise MessageBusError
"""
- # Cache and disable auto reconnect
- old_reconnect = DEFAULT_BROKER_OPTIONS.get('reconnect', False)
- DEFAULT_BROKER_OPTIONS['reconnect'] = False
-
regexp = re.escape(self.error) + '.*' + 'Connection refused'
with self.assertRaisesRegexp(MessageBusError, regexp):
with ToBus(QUEUE, broker="localhost:4"):
pass
- # Restore auto reconnect
- DEFAULT_BROKER_OPTIONS['reconnect'] = old_reconnect
-
class ToBusSendMessage(unittest.TestCase):
"""
--
GitLab