This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new 817ecb9 DISPATCH-1301 - Got the reply_to address from inside of
on_link_opened. This prevents test failures due to prematurely getting the rely
address. This closes #478.
817ecb9 is described below
commit 817ecb9b6bd91965a255c941cdafa750ee0fb97f
Author: Ganesh Murthy <gmur...@redhat.com>
AuthorDate: Mon Mar 25 10:27:26 2019 -0400
DISPATCH-1301 - Got the reply_to address from inside of on_link_opened.
This prevents test failures due to prematurely getting the rely address. This
closes #478.
---
tests/system_tests_one_router.py | 38 ++++++++++++++------------------------
tests/system_tests_two_routers.py | 32 +++++++++++++-------------------
2 files changed, 27 insertions(+), 43 deletions(-)
diff --git a/tests/system_tests_one_router.py b/tests/system_tests_one_router.py
index c5fa323..1005912 100644
--- a/tests/system_tests_one_router.py
+++ b/tests/system_tests_one_router.py
@@ -479,13 +479,11 @@ class OneRouterTest(TestCase):
# if the connection is gone.
if conn_properties.get('int_property'):
identity = output.get("identity")
- print (identity)
if identity:
update_command = 'UPDATE --type=connection
adminStatus=deleted --id=' + identity
try:
outputs =
json.loads(self.run_qdmanage(update_command))
except Exception as e:
- print (e)
if "Forbidden" in str(e):
passed = True
@@ -727,7 +725,6 @@ class ManagementNotImplemented(MessagingHandler):
self.receiver = None
self.sent_count = 0
self.error = None
- self.num_messages = 0
def timeout(self):
self.error = "No response received for management request"
@@ -744,15 +741,15 @@ class ManagementNotImplemented(MessagingHandler):
self.sender = event.container.create_sender(self.conn)
self.receiver = event.container.create_receiver(self.conn, None,
dynamic=True)
- def on_sendable(self, event):
- if self.num_messages < 1:
+ def on_link_opened(self, event):
+ if event.receiver == self.receiver:
request = Message()
request.address = "amqp:/_local/$management"
- request.reply_to = self.receiver.remote_source.address
- request.properties = {u'type':u'org.amqp.management',
u'name':u'self', u'operation':u'NOT-IMPL'}
-
- event.sender.send(request)
- self.num_messages += 1
+ request.reply_to = event.receiver.remote_source.address
+ request.properties = {u'type': u'org.amqp.management',
+ u'name': u'self',
+ u'operation': u'NOT-IMPL'}
+ self.sender.send(request)
def run(self):
Container(self).run()
@@ -775,7 +772,6 @@ class ManagementGetOperationsTest(MessagingHandler):
self.receiver = None
self.sent_count = 0
self.error = None
- self.num_messages = 0
def timeout(self):
self.error = "No response received for management request"
@@ -792,15 +788,13 @@ class ManagementGetOperationsTest(MessagingHandler):
self.sender = event.container.create_sender(self.conn)
self.receiver = event.container.create_receiver(self.conn, None,
dynamic=True)
- def on_sendable(self, event):
- if self.num_messages < 1:
+ def on_link_opened(self, event):
+ if self.receiver == event.receiver:
request = Message()
request.address = "amqp:/_local/$management"
request.reply_to = self.receiver.remote_source.address
request.properties = {u'type':u'org.amqp.management',
u'name':u'self', u'operation':u'GET-OPERATIONS'}
-
- event.sender.send(request)
- self.num_messages += 1
+ self.sender.send(request)
def run(self):
Container(self).run()
@@ -830,7 +824,6 @@ class ManagementTest(MessagingHandler):
self.sent_count = 0
self.msg_not_sent = True
self.error = None
- self.num_messages = 0
self.response1 = False
self.response2 = False
@@ -847,24 +840,21 @@ class ManagementTest(MessagingHandler):
self.sender = event.container.create_sender(self.conn)
self.receiver = event.container.create_receiver(self.conn, None,
dynamic=True)
- def on_sendable(self, event):
- if self.num_messages < 2:
+ def on_link_opened(self, event):
+ if event.receiver == self.receiver:
request = Message()
request.address = "amqp:/$management"
request.reply_to = self.receiver.remote_source.address
request.correlation_id = "C1"
request.properties = {u'type': u'org.amqp.management', u'name':
u'self', u'operation': u'GET-MGMT-NODES'}
-
- event.sender.send(request)
- self.num_messages += 1
+ self.sender.send(request)
request = Message()
request.address = "amqp:/_topo/0/QDR.B/$management"
request.correlation_id = "C2"
request.reply_to = self.receiver.remote_source.address
request.properties = {u'type': u'org.amqp.management', u'name':
u'self', u'operation': u'GET-MGMT-NODES'}
- event.sender.send(request)
- self.num_messages += 1
+ self.sender.send(request)
def on_message(self, event):
if event.receiver == self.receiver:
diff --git a/tests/system_tests_two_routers.py
b/tests/system_tests_two_routers.py
index b336755..55100ee 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -367,7 +367,6 @@ class DeleteConnectionWithReceiver(MessagingHandler):
def __init__(self, address):
super(DeleteConnectionWithReceiver, self).__init__()
self.address = address
- self.num_messages = 0
self.mgmt_receiver = None
self.mgmt_receiver_1 = None
self.mgmt_receiver_2 = None
@@ -404,16 +403,15 @@ class DeleteConnectionWithReceiver(MessagingHandler):
self.mgmt_conn.close()
self.conn_to_kill.close()
- def on_sendable(self, event):
- if event.sender == self.mgmt_sender:
- if self.num_messages < 1:
- request = Message()
- request.address = "amqp:/_local/$management"
- request.properties = {u'type':
u'org.apache.qpid.dispatch.connection',
- u'operation': u'QUERY'}
- request.reply_to = self.mgmt_receiver.remote_source.address
- event.sender.send(request)
- self.num_messages += 1
+ def on_link_opened(self, event):
+ if event.receiver == self.mgmt_receiver:
+ request = Message()
+ request.address = "amqp:/_local/$management"
+ request.properties = {
+ u'type': u'org.apache.qpid.dispatch.connection',
+ u'operation': u'QUERY'}
+ request.reply_to = self.mgmt_receiver.remote_source.address
+ self.mgmt_sender.send(request)
def on_message(self, event):
if event.receiver == self.mgmt_receiver:
@@ -426,7 +424,6 @@ class DeleteConnectionWithReceiver(MessagingHandler):
properties = result[property_index]
if properties.get('int_property'):
identity = result[identity_index]
- print (identity)
if identity:
request = Message()
request.address = "amqp:/_local/$management"
@@ -806,7 +803,6 @@ class ManagementTest(MessagingHandler):
self.sent_count = 0
self.msg_not_sent = True
self.error = None
- self.num_messages = 0
self.response1 = False
self.response2 = False
@@ -822,23 +818,21 @@ class ManagementTest(MessagingHandler):
self.sender = event.container.create_sender(self.conn)
self.receiver = event.container.create_receiver(self.conn, None,
dynamic=True)
- def on_sendable(self, event):
- if self.num_messages < 2:
+ def on_link_opened(self, event):
+ if event.receiver == self.receiver:
request = Message()
request.correlation_id = "C1"
request.address = "amqp:/_local/$management"
request.properties = {u'type': u'org.amqp.management', u'name':
u'self', u'operation': u'GET-MGMT-NODES'}
request.reply_to = self.receiver.remote_source.address
- event.sender.send(request)
- self.num_messages += 1
+ self.sender.send(request)
request = Message()
request.address = "amqp:/_topo/0/QDR.B/$management"
request.correlation_id = "C2"
request.reply_to = self.receiver.remote_source.address
request.properties = {u'type': u'org.amqp.management', u'name':
u'self', u'operation': u'GET-MGMT-NODES'}
- event.sender.send(request)
- self.num_messages += 1
+ self.sender.send(request)
def on_message(self, event):
if event.receiver == self.receiver:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
