You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2016/12/07 21:16:38 UTC
qpid-dispatch git commit: DISPATCH-209 : targeted sender test
Repository: qpid-dispatch
Updated Branches:
refs/heads/master fbe70e2c2 -> 49fe290d6
DISPATCH-209 : targeted sender test
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/49fe290d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/49fe290d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/49fe290d
Branch: refs/heads/master
Commit: 49fe290d65a3517a9927586301420842df654f12
Parents: fbe70e2
Author: mick <mi...@redhat.com>
Authored: Wed Dec 7 16:00:26 2016 -0500
Committer: mick <mi...@redhat.com>
Committed: Wed Dec 7 16:00:26 2016 -0500
----------------------------------------------------------------------
tests/CMakeLists.txt | 3 +-
tests/system_tests_three_routers.py | 145 +++++++++++++++++++++++++++++++
2 files changed, 147 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/49fe290d/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d70ccbc..95840f6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -85,7 +85,8 @@ foreach(py_test_module
system_tests_user_id
system_tests_user_id_proxy
system_tests_deprecated
- system_tests_two_routers)
+ system_tests_two_routers
+ system_tests_three_routers)
add_test(${py_test_module} ${TEST_WRAP} -m unittest -v ${py_test_module})
list(APPEND SYSTEM_TEST_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${py_test_module}.py)
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/49fe290d/tests/system_tests_three_routers.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_three_routers.py b/tests/system_tests_three_routers.py
new file mode 100644
index 0000000..def31ff
--- /dev/null
+++ b/tests/system_tests_three_routers.py
@@ -0,0 +1,145 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+import unittest, os, json
+from subprocess import PIPE, STDOUT
+from proton import Message, PENDING, ACCEPTED, REJECTED, RELEASED, SSLDomain, SSLUnavailable, Timeout
+from system_test import TestCase, Qdrouterd, main_module, DIR, TIMEOUT, Process
+from proton.handlers import MessagingHandler
+from proton.reactor import Container, AtMostOnce, AtLeastOnce
+
+
+# PROTON-828:
+try:
+ from proton import MODIFIED
+except ImportError:
+ from proton import PN_STATUS_MODIFIED as MODIFIED
+
+
+class RouterTest(TestCase):
+
+ inter_router_port = None
+
+ @classmethod
+ def setUpClass(cls):
+ """Start a router and a messenger"""
+ super(RouterTest, cls).setUpClass()
+
+ def router(name, connection_1, connection_2=None):
+
+ config = [
+ ('router', {'mode': 'interior', 'id': 'QDR.%s'%name}),
+
+ ('listener', {'port': cls.tester.get_port(), 'stripAnnotations': 'no'}),
+
+ ('address', {'prefix': 'closest', 'distribution': 'closest'}),
+ ('address', {'prefix': 'spread', 'distribution': 'balanced'}),
+ ('address', {'prefix': 'multicast', 'distribution': 'multicast'})
+ ]
+ config.append(connection_1)
+ if None != connection_2:
+ config.append(connection_2)
+
+ config = Qdrouterd.Config(config)
+
+ cls.routers.append(cls.tester.qdrouterd(name, config, wait=True))
+
+ cls.routers = []
+
+ inter_router_port_1 = cls.tester.get_port()
+ inter_router_port_2 = cls.tester.get_port()
+
+ router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port_1}) )
+
+ router('B', ('listener', {'role': 'inter-router', 'port': inter_router_port_2}),
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port_1, 'verifyHostName': 'no'}))
+
+ router('C', ('connector', {'name': 'connectorToB', 'role': 'inter-router', 'port': inter_router_port_2, 'verifyHostName': 'no'}))
+
+ cls.routers[0].wait_router_connected('QDR.C')
+ cls.routers[1].wait_router_connected('QDR.B')
+ cls.routers[2].wait_router_connected('QDR.A')
+
+
+
+ def test_01_targeted_sender(self):
+ test = TargetedSenderTest(self.routers[0].addresses[0], self.routers[2].addresses[0])
+ test.run()
+ self.assertEqual(None, test.error)
+
+
+class Timeout(object):
+ def __init__(self, parent):
+ self.parent = parent
+
+ def on_timer_task(self, event):
+ self.parent.timeout()
+
+
+class TargetedSenderTest(MessagingHandler):
+ def __init__(self, address1, address2):
+ super(TargetedSenderTest, self).__init__(prefetch=0)
+ self.address1 = address1
+ self.address2 = address2
+ self.dest = "closest.Targeted"
+ self.error = None
+ self.sender = None
+ self.receiver = None
+ self.n_expected = 10
+ self.n_sent = 0
+ self.n_received = 0
+ self.n_accepted = 0
+
+ def timeout(self):
+ self.error = "Timeout Expired"
+ self.conn1.close()
+ self.conn2.close()
+
+ def on_start(self, event):
+ self.timer = event.reactor.schedule(10, Timeout(self))
+ self.conn1 = event.container.connect(self.address1)
+ self.conn2 = event.container.connect(self.address2)
+ self.sender = event.container.create_sender(self.conn1, self.dest)
+ self.receiver = event.container.create_receiver(self.conn2, self.dest)
+ self.receiver.flow(self.n_expected)
+
+ def on_sendable(self, event):
+ if self.n_sent < self.n_expected:
+ msg = Message(body=self.n_sent)
+ event.sender.send(msg)
+ self.n_sent += 1
+
+ def on_accepted(self, event):
+ self.n_accepted += 1
+
+ def on_message(self, event):
+ self.n_received += 1
+ if self.n_received == self.n_expected:
+ self.receiver.close()
+ self.conn1.close()
+ self.conn2.close()
+ self.timer.cancel()
+
+
+ def run(self):
+ Container(self).run()
+
+
+if __name__ == '__main__':
+ unittest.main(main_module())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org