Author: tross
Date: Tue Oct 28 17:13:38 2014
New Revision: 1634921
URL: http://svn.apache.org/r1634921
Log:
NO-JIRA - Updated test configurations to use lowerCamelCase.
Added low timeouts to the spread test to make it run _much_ faster.
Modified:
qpid/dispatch/trunk/tests/system_tests_one_router.py
qpid/dispatch/trunk/tests/system_tests_two_routers.py
Modified: qpid/dispatch/trunk/tests/system_tests_one_router.py
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_one_router.py?rev=1634921&r1=1634920&r2=1634921&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_one_router.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_one_router.py Tue Oct 28 17:13:38
2014
@@ -30,13 +30,13 @@ class RouterTest(TestCase):
super(RouterTest, cls).setUpClass()
name = "test-router"
config = Qdrouterd.Config([
- ('container', {'worker-threads': 4, 'container-name':
'Qpid.Dispatch.Router.A'}),
- ('router', {'mode': 'standalone', 'router-id': 'QDR'}),
+ ('container', {'workerThreads': 4, 'containerName':
'Qpid.Dispatch.Router.A'}),
+ ('router', {'mode': 'standalone', 'routerId': 'QDR'}),
('listener', {'port': cls.tester.get_port()}),
- ('fixed-address', {'prefix': '/closest/', 'fanout': 'single',
'bias': 'closest'}),
- ('fixed-address', {'prefix': '/spread/', 'fanout': 'single',
'bias': 'spread'}),
- ('fixed-address', {'prefix': '/multicast/', 'fanout': 'multiple'}),
- ('fixed-address', {'prefix': '/', 'fanout': 'multiple'})
+ ('fixedAddress', {'prefix': '/closest/', 'fanout': 'single',
'bias': 'closest'}),
+ ('fixedAddress', {'prefix': '/spread/', 'fanout': 'single',
'bias': 'spread'}),
+ ('fixedAddress', {'prefix': '/multicast/', 'fanout': 'multiple'}),
+ ('fixedAddress', {'prefix': '/', 'fanout': 'multiple'})
])
cls.router = cls.tester.qdrouterd(name, config)
cls.router.wait_ready()
Modified: qpid/dispatch/trunk/tests/system_tests_two_routers.py
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_two_routers.py?rev=1634921&r1=1634920&r2=1634921&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_two_routers.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_two_routers.py Tue Oct 28 17:13:38
2014
@@ -32,13 +32,13 @@ class RouterTest(TestCase):
def router(name, client_server, connection):
config = Qdrouterd.Config(ssl_config(client_server, connection) + [
- ('container', {'worker-threads': 4, 'container-name':
'Qpid.Dispatch.Router.%s'%name}),
- ('router', {'mode': 'interior', 'router-id': 'QDR.%s'%name}),
+ ('container', {'workerThreads': 4, 'containerName':
'Qpid.Dispatch.Router.%s'%name}),
+ ('router', {'mode': 'interior', 'routerId': 'QDR.%s'%name}),
('listener', {'port': cls.tester.get_port()}),
- ('fixed-address', {'prefix': '/closest/', 'fanout': 'single',
'bias': 'closest'}),
- ('fixed-address', {'prefix': '/spread/', 'fanout': 'single',
'bias': 'spread'}),
- ('fixed-address', {'prefix': '/multicast/', 'fanout':
'multiple'}),
- ('fixed-address', {'prefix': '/', 'fanout': 'multiple'}),
+ ('fixedAddress', {'prefix': '/closest/', 'fanout': 'single',
'bias': 'closest'}),
+ ('fixedAddress', {'prefix': '/spread/', 'fanout': 'single',
'bias': 'spread'}),
+ ('fixedAddress', {'prefix': '/multicast/', 'fanout':
'multiple'}),
+ ('fixedAddress', {'prefix': '/', 'fanout': 'multiple'}),
connection
])
cls.routers.append(cls.tester.qdrouterd(name, config, wait=True))
@@ -626,6 +626,10 @@ class RouterTest(TestCase):
M3 = self.messenger()
M4 = self.messenger()
+ M2.timeout = 0.1
+ M3.timeout = 0.1
+ M4.timeout = 0.1
+
M1.route("amqp:/*", self.routers[0].addresses[0]+"/$1")
M2.route("amqp:/*", self.routers[1].addresses[0]+"/$1")
M3.route("amqp:/*", self.routers[0].addresses[0]+"/$1")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
