You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2016/05/17 21:56:48 UTC
qpid-dispatch git commit: DISPATCH-340: Search connection list for
interrouter connection.
Repository: qpid-dispatch
Updated Branches:
refs/heads/master e590e9ed9 -> 8e14e28a4
DISPATCH-340: Search connection list for interrouter connection.
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/8e14e28a
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/8e14e28a
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/8e14e28a
Branch: refs/heads/master
Commit: 8e14e28a4025a8494048ade09db99e37588faf69
Parents: e590e9e
Author: Chuck Rolke <cr...@redhat.com>
Authored: Tue May 17 17:53:48 2016 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Tue May 17 17:53:48 2016 -0400
----------------------------------------------------------------------
tests/system_tests_sasl_plain.py | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/8e14e28a/tests/system_tests_sasl_plain.py
----------------------------------------------------------------------
diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py
index 48a2b0a..2565635 100644
--- a/tests/system_tests_sasl_plain.py
+++ b/tests/system_tests_sasl_plain.py
@@ -368,7 +368,7 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
cls.routers[0].wait_ports()
cls.routers[1].wait_ports()
- cls.routers[1].wait_connectors(timeout=3)
+ cls.routers[1].wait_connectors(timeout=10)
def test_inter_router_plain_over_ssl_exists(self):
"""
@@ -376,19 +376,31 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
"""
local_node = Node.connect(self.routers[1].addresses[0], timeout=TIMEOUT)
- self.assertEqual(3, len(local_node.query(type='org.apache.qpid.dispatch.connection').results))
+ results = local_node.query(type='org.apache.qpid.dispatch.connection').results
+
+ self.assertEqual(3, len(results))
+
+ search = "QDR.X"
+ found = False
+
+ for N in range(0,3):
+ if results[N][0] == search:
+ found = True
+ break
+
+ self.assertTrue(found, "Connection to %s not found" % search)
# sslProto should be TLSv1/SSLv3
- self.assertEqual(u'TLSv1/SSLv3', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][4])
+ self.assertEqual(u'TLSv1/SSLv3', results[N][4])
# role should be inter-router
- self.assertEqual(u'inter-router', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][9])
+ self.assertEqual(u'inter-router', results[N][9])
# sasl must be plain
- self.assertEqual(u'PLAIN', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][12])
+ self.assertEqual(u'PLAIN', results[N][12])
# user must be test@domain.com
- self.assertEqual(u'test@domain.com', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][16])
+ self.assertEqual(u'test@domain.com', results[N][16])
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