Author: tross
Date: Tue Jan 14 14:15:00 2014
New Revision: 1558042
URL: http://svn.apache.org/r1558042
Log:
NO-JIRA - Adjusted the TCP ports for the system tests.
Modified:
qpid/dispatch/trunk/tests/config-2/A.conf
qpid/dispatch/trunk/tests/config-2/B.conf
qpid/dispatch/trunk/tests/system_tests_two_routers.py
Modified: qpid/dispatch/trunk/tests/config-2/A.conf
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/A.conf?rev=1558042&r1=1558041&r2=1558042&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/A.conf (original)
+++ qpid/dispatch/trunk/tests/config-2/A.conf Tue Jan 14 14:15:00 2014
@@ -48,14 +48,14 @@ container {
##
listener {
addr: 0.0.0.0
- port: 20000
+ port: 20100
sasl-mechanisms: ANONYMOUS
}
listener {
role: inter-router
addr: 0.0.0.0
- port: 20002
+ port: 20102
sasl-mechanisms: ANONYMOUS
}
Modified: qpid/dispatch/trunk/tests/config-2/B.conf
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/config-2/B.conf?rev=1558042&r1=1558041&r2=1558042&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/config-2/B.conf (original)
+++ qpid/dispatch/trunk/tests/config-2/B.conf Tue Jan 14 14:15:00 2014
@@ -48,7 +48,7 @@ container {
##
listener {
addr: 0.0.0.0
- port: 20001
+ port: 20101
sasl-mechanisms: ANONYMOUS
}
@@ -56,7 +56,7 @@ connector {
label: Router Uplink
role: inter-router
addr: 0.0.0.0
- port: 20002
+ port: 20102
sasl-mechanisms: ANONYMOUS
}
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=1558042&r1=1558041&r2=1558042&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_two_routers.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_two_routers.py Tue Jan 14 14:15:00
2014
@@ -65,8 +65,8 @@ def startRouter(obj):
M1 = Messenger()
M2 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.start()
M2.start()
@@ -115,7 +115,7 @@ class RouterTest(unittest.TestCase):
return sub
def test_00_discard(self):
- addr = "amqp://0.0.0.0:20000/discard/1"
+ addr = "amqp://0.0.0.0:20100/discard/1"
M1 = Messenger()
M1.timeout = 1.0
M1.start()
@@ -133,8 +133,8 @@ class RouterTest(unittest.TestCase):
M1 = Messenger()
M2 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -170,10 +170,10 @@ class RouterTest(unittest.TestCase):
M3 = Messenger()
M4 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
- M3.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M4.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
+ M3.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M4.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -224,10 +224,10 @@ class RouterTest(unittest.TestCase):
M3 = Messenger()
M4 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
- M3.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M4.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
+ M3.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M4.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -288,8 +288,8 @@ class RouterTest(unittest.TestCase):
M1 = Messenger()
M2 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -332,8 +332,8 @@ class RouterTest(unittest.TestCase):
M1 = Messenger()
M2 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -393,7 +393,7 @@ class RouterTest(unittest.TestCase):
def test_04_unsettled_undeliverable(self):
- addr = "amqp://0.0.0.0:20000/unsettled_undeliverable/1"
+ addr = "amqp://0.0.0.0:20100/unsettled_undeliverable/1"
M1 = Messenger()
M1.timeout = 1.0
@@ -417,8 +417,8 @@ class RouterTest(unittest.TestCase):
M1 = Messenger()
M2 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -482,8 +482,8 @@ class RouterTest(unittest.TestCase):
M1 = Messenger()
M2 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -523,7 +523,7 @@ class RouterTest(unittest.TestCase):
M = Messenger()
M.timeout = 2.0
M.start()
- M.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
+ M.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
sub = self.subscribe(M, "amqp:/#")
reply = sub.address
@@ -565,10 +565,10 @@ class RouterTest(unittest.TestCase):
M3 = Messenger()
M4 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
- M3.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M4.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
+ M3.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M4.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -628,10 +628,10 @@ class RouterTest(unittest.TestCase):
M3 = Messenger()
M4 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
- M3.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M4.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
+ M3.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M4.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -681,10 +681,10 @@ class RouterTest(unittest.TestCase):
M3 = Messenger()
M4 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
- M3.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M4.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
+ M3.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M4.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 1.0
@@ -737,10 +737,10 @@ class RouterTest(unittest.TestCase):
M3 = Messenger()
M4 = Messenger()
- M1.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M2.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
- M3.route("amqp:/*", "amqp://0.0.0.0:20000/$1")
- M4.route("amqp:/*", "amqp://0.0.0.0:20001/$1")
+ M1.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M2.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
+ M3.route("amqp:/*", "amqp://0.0.0.0:20100/$1")
+ M4.route("amqp:/*", "amqp://0.0.0.0:20101/$1")
M1.timeout = 1.0
M2.timeout = 0.2
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
