Repository: qpid-dispatch Updated Branches: refs/heads/master 75492de7a -> 427836291
DISPATCH-557 - Fixed broken tests Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/42783629 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/42783629 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/42783629 Branch: refs/heads/master Commit: 427836291cf9f2faa77fd43fd39c49f6c0bfebd9 Parents: d1b0ea3 Author: Ted Ross <tr...@redhat.com> Authored: Tue Jan 3 09:30:02 2017 -0500 Committer: Ted Ross <tr...@redhat.com> Committed: Tue Jan 3 09:30:24 2017 -0500 ---------------------------------------------------------------------- src/router_core/agent_connection.c | 6 +++--- tests/system_tests_deprecated.py | 6 +++--- tests/system_tests_sasl_plain.py | 28 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/42783629/src/router_core/agent_connection.c ---------------------------------------------------------------------- diff --git a/src/router_core/agent_connection.c b/src/router_core/agent_connection.c index f302e56..ad5bff2 100644 --- a/src/router_core/agent_connection.c +++ b/src/router_core/agent_connection.c @@ -340,11 +340,11 @@ static qdr_connection_t *qdr_connection_find_by_identity_CT(qdr_core_t *core, qd } -void qdra_connection_get_CT(qdr_core_t *core, +void qdra_connection_get_CT(qdr_core_t *core, qd_iterator_t *name, qd_iterator_t *identity, - qdr_query_t *query, - const char *qdr_connection_columns[]) + qdr_query_t *query, + const char *qdr_connection_columns[]) { qdr_connection_t *conn = 0; http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/42783629/tests/system_tests_deprecated.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_deprecated.py b/tests/system_tests_deprecated.py index da7c19a..73c5f46 100644 --- a/tests/system_tests_deprecated.py +++ b/tests/system_tests_deprecated.py @@ -100,13 +100,13 @@ class RouterTestDeprecated(RouterTestPlainSaslCommon): # ContainerEntity has been deprecated. # role should be inter-router - self.assertEqual(u'inter-router', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][2]) + self.assertEqual(u'inter-router', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][3]) # sasl must be plain - self.assertEqual(u'PLAIN', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][5]) + self.assertEqual(u'PLAIN', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][6]) # user must be t...@domain.com - self.assertEqual(u't...@domain.com', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][7]) + self.assertEqual(u't...@domain.com', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][8]) # Make sure that the deprecated linkRoutePattern is set up correctly query_response = local_node.query(type='org.apache.qpid.dispatch.router.config.linkRoute') http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/42783629/tests/system_tests_sasl_plain.py ---------------------------------------------------------------------- diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py index 4de567d..0e11dab 100644 --- a/tests/system_tests_sasl_plain.py +++ b/tests/system_tests_sasl_plain.py @@ -283,16 +283,16 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon): local_node = Node.connect(self.routers[0].addresses[1], timeout=TIMEOUT) # sslProto should be TLSv1/SSLv3 - self.assertEqual(u'TLSv1/SSLv3', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][9]) + self.assertEqual(u'TLSv1/SSLv3', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][10]) # role should be inter-router - self.assertEqual(u'inter-router', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][2]) + self.assertEqual(u'inter-router', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][3]) # sasl must be plain - self.assertEqual(u'PLAIN', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][5]) + self.assertEqual(u'PLAIN', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][6]) # user must be t...@domain.com - self.assertEqual(u't...@domain.com', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][7]) + self.assertEqual(u't...@domain.com', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][8]) class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon): @@ -373,11 +373,11 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon): # There should be only two connections. # There will be no inter-router connection self.assertEqual(2, len(local_node.query(type='org.apache.qpid.dispatch.connection').results)) - self.assertEqual('in', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][3]) - self.assertEqual('normal', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][2]) - self.assertEqual('anonymous', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][7]) - self.assertEqual('normal', local_node.query(type='org.apache.qpid.dispatch.connection').results[1][2]) - self.assertEqual('anonymous', local_node.query(type='org.apache.qpid.dispatch.connection').results[1][7]) + self.assertEqual('in', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][4]) + self.assertEqual('normal', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][3]) + self.assertEqual('anonymous', local_node.query(type='org.apache.qpid.dispatch.connection').results[0][8]) + self.assertEqual('normal', local_node.query(type='org.apache.qpid.dispatch.connection').results[1][3]) + self.assertEqual('anonymous', local_node.query(type='org.apache.qpid.dispatch.connection').results[1][8]) class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon): @@ -470,23 +470,23 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon): found = False for N in range(0, len(results)): - if results[N][4] == search: + if results[N][5] == search: found = True break self.assertTrue(found, "Connection to %s not found" % search) # sslProto should be TLSv1/SSLv3 - self.assertEqual(u'TLSv1/SSLv3', results[N][9]) + self.assertEqual(u'TLSv1/SSLv3', results[N][10]) # role should be inter-router - self.assertEqual(u'inter-router', results[N][2]) + self.assertEqual(u'inter-router', results[N][3]) # sasl must be plain - self.assertEqual(u'PLAIN', results[N][5]) + self.assertEqual(u'PLAIN', results[N][6]) # user must be t...@domain.com - self.assertEqual(u't...@domain.com', results[N][7]) + self.assertEqual(u't...@domain.com', results[N][8]) def test_inter_router_plain_over_ssl_exists(self): """ --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
