You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2020/09/08 17:05:02 UTC
[qpid-dispatch] branch master updated: DISPATCH-1771: misc test
tidyups: drop unused TLS config,
dont disable host verifiation when not testing that, fix some comments
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new ea62506 DISPATCH-1771: misc test tidyups: drop unused TLS config, dont disable host verifiation when not testing that, fix some comments
ea62506 is described below
commit ea62506bb1057fc79612a07b8fa60d56287413ef
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Tue Sep 8 18:04:17 2020 +0100
DISPATCH-1771: misc test tidyups: drop unused TLS config, dont disable host verifiation when not testing that, fix some comments
This closes #845
---
tests/system_tests_autolinks.py | 2 +-
tests/system_tests_delivery_abort.py | 2 +-
tests/system_tests_delivery_counts.py | 12 ++++--------
tests/system_tests_distribution.py | 4 ----
tests/system_tests_dynamic_terminus.py | 2 +-
tests/system_tests_exchange_bindings.py | 3 +--
tests/system_tests_handle_failover.py.in | 2 +-
tests/system_tests_log_level_update.py | 3 +--
tests/system_tests_multi_tenancy.py | 2 +-
tests/system_tests_multi_tenancy_policy.py | 2 +-
tests/system_tests_policy.py | 8 ++++----
tests/system_tests_priority.py | 2 --
tests/system_tests_protocol_settings.py | 6 ++----
tests/system_tests_routing_protocol.py | 2 +-
tests/system_tests_sasl_plain.py | 27 ++++++++-------------------
tests/system_tests_topology.py | 6 ------
tests/system_tests_topology_addition.py | 5 -----
tests/system_tests_topology_disposition.py.in | 7 -------
tests/system_tests_two_routers.py | 6 ++----
19 files changed, 29 insertions(+), 74 deletions(-)
diff --git a/tests/system_tests_autolinks.py b/tests/system_tests_autolinks.py
index c00849e..4102c87 100644
--- a/tests/system_tests_autolinks.py
+++ b/tests/system_tests_autolinks.py
@@ -395,7 +395,7 @@ class WaypointReceiverPhaseTest(TestCase):
('router', {'mode': 'interior', 'id': 'B'}),
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port()}),
('connector', {'name': 'connectorToB', 'role': 'inter-router',
- 'port': cls.inter_router_port, 'verifyHostname': 'no'}),
+ 'port': cls.inter_router_port}),
('address', {'prefix': '0.0.0.0/queue', 'waypoint': 'yes'}),
])
diff --git a/tests/system_tests_delivery_abort.py b/tests/system_tests_delivery_abort.py
index 36d7a91..0a5e600 100644
--- a/tests/system_tests_delivery_abort.py
+++ b/tests/system_tests_delivery_abort.py
@@ -61,7 +61,7 @@ class RouterTest(TestCase):
inter_router_port = cls.tester.get_port()
router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port}))
- router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port, 'verifyHostname': 'no'}))
+ router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('B')
cls.routers[1].wait_router_connected('A')
diff --git a/tests/system_tests_delivery_counts.py b/tests/system_tests_delivery_counts.py
index a9661c6..81edbe6 100644
--- a/tests/system_tests_delivery_counts.py
+++ b/tests/system_tests_delivery_counts.py
@@ -233,8 +233,7 @@ class TwoRouterReleasedDroppedPresettledTest(TestCase):
config_2 = Qdrouterd.Config([
('router', {'mode': 'interior', 'id': 'B'}),
('listener', {'port': listen_port_2, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'}),
- ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router,
- 'verifyHostname': 'no'}),
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router}),
])
cls.routers = []
@@ -522,8 +521,7 @@ class TwoRouterLargeMessagePresettledCountTest(TestCase):
config_2 = Qdrouterd.Config([
('router', {'mode': 'interior', 'id': 'B'}),
('listener', {'port': listen_port_2, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'}),
- ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router,
- 'verifyHostname': 'no'}),
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router}),
])
cls.routers = []
@@ -563,8 +561,7 @@ class TwoRouterLargeMessagePresettledReleasedCountTest(TestCase):
config_2 = Qdrouterd.Config([
('router', {'mode': 'interior', 'id': 'B'}),
('listener', {'port': listen_port_2, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'}),
- ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router,
- 'verifyHostname': 'no'}),
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router}),
])
cls.routers = []
@@ -721,8 +718,7 @@ class TwoRouterIngressEgressTest(TestCase):
config_2 = Qdrouterd.Config([
('router', {'mode': 'interior', 'id': 'B'}),
('listener', {'port': listen_port_2, 'authenticatePeer': False, 'saslMechanisms': 'ANONYMOUS'}),
- ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router,
- 'verifyHostname': 'no'}),
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': listen_port_inter_router}),
])
cls.routers = []
diff --git a/tests/system_tests_distribution.py b/tests/system_tests_distribution.py
index c9b3c9d..d8c6807 100644
--- a/tests/system_tests_distribution.py
+++ b/tests/system_tests_distribution.py
@@ -431,7 +431,6 @@ class DistributionTests ( TestCase ):
{ 'name': 'connectorToA',
'role': 'inter-router',
'port': A_inter_router_port_1,
- 'verifyHostname': 'no',
'cost': cls.A_B_cost
}
)
@@ -456,7 +455,6 @@ class DistributionTests ( TestCase ):
{ 'name': 'connectorToB',
'role': 'inter-router',
'port': B_inter_router_port_1,
- 'verifyHostname': 'no',
'cost' : cls.B_C_cost
}
)
@@ -481,7 +479,6 @@ class DistributionTests ( TestCase ):
{ 'name': 'connectorToA',
'role': 'inter-router',
'port': A_inter_router_port_2,
- 'verifyHostname': 'no',
'cost' : cls.A_D_cost
}
),
@@ -489,7 +486,6 @@ class DistributionTests ( TestCase ):
{ 'name': 'connectorToB',
'role': 'inter-router',
'port': B_inter_router_port_2,
- 'verifyHostname': 'no',
'cost' : cls.B_D_cost
}
)
diff --git a/tests/system_tests_dynamic_terminus.py b/tests/system_tests_dynamic_terminus.py
index 93fa44d..d9efa52 100644
--- a/tests/system_tests_dynamic_terminus.py
+++ b/tests/system_tests_dynamic_terminus.py
@@ -58,7 +58,7 @@ class RouterTest(TestCase):
inter_router_port = cls.tester.get_port()
router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port}))
- router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port, 'verifyHostname': 'no'}))
+ router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('B')
cls.routers[1].wait_router_connected('A')
diff --git a/tests/system_tests_exchange_bindings.py b/tests/system_tests_exchange_bindings.py
index 6de480a..90d3c12 100644
--- a/tests/system_tests_exchange_bindings.py
+++ b/tests/system_tests_exchange_bindings.py
@@ -567,8 +567,7 @@ class ExchangeBindingsTest(TestCase):
router(self, 'B',
[('connector', {'name': 'connectorToA',
'role': 'inter-router',
- 'port': self.inter_router_port,
- 'verifyHostname': 'no'}),
+ 'port': self.inter_router_port}),
('address', {'pattern': 'nextHop1/#',
'distribution': 'multicast'}),
('address', {'pattern': 'nextHop2/#',
diff --git a/tests/system_tests_handle_failover.py.in b/tests/system_tests_handle_failover.py.in
index da7ab85..7fc2951 100644
--- a/tests/system_tests_handle_failover.py.in
+++ b/tests/system_tests_handle_failover.py.in
@@ -79,7 +79,7 @@ class FailoverTest(TestCase):
('router', {'mode': 'interior', 'id': 'A'}),
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port()}),
('connector', {'name': 'connectorToB', 'role': 'inter-router',
- 'port': cls.inter_router_port, 'verifyHostname': 'no'}),
+ 'port': cls.inter_router_port}),
]
)
diff --git a/tests/system_tests_log_level_update.py b/tests/system_tests_log_level_update.py
index 23fd3b5..9461fc0 100644
--- a/tests/system_tests_log_level_update.py
+++ b/tests/system_tests_log_level_update.py
@@ -246,8 +246,7 @@ class EnableConnectionLevelInterRouterTraceTest(TestCase):
('listener', {'role': 'inter-router', 'port': inter_router_port}))
router('B',
- ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port,
- 'verifyHostname': 'no'}))
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('QDR.B')
cls.routers[1].wait_router_connected('QDR.A')
diff --git a/tests/system_tests_multi_tenancy.py b/tests/system_tests_multi_tenancy.py
index d34c825..475e04c 100644
--- a/tests/system_tests_multi_tenancy.py
+++ b/tests/system_tests_multi_tenancy.py
@@ -67,7 +67,7 @@ class RouterTest(TestCase):
inter_router_port = cls.tester.get_port()
router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port}))
- router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port, 'verifyHostname': 'no'}))
+ router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('B')
cls.routers[1].wait_router_connected('A')
diff --git a/tests/system_tests_multi_tenancy_policy.py b/tests/system_tests_multi_tenancy_policy.py
index 4b40bc7..70b2c09 100644
--- a/tests/system_tests_multi_tenancy_policy.py
+++ b/tests/system_tests_multi_tenancy_policy.py
@@ -84,7 +84,7 @@ class RouterMultitenantPolicyTest(TestCase):
inter_router_port = cls.tester.get_port()
router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port}))
- router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port, 'verifyHostname': 'no'}))
+ router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('B')
cls.routers[1].wait_router_connected('A')
diff --git a/tests/system_tests_policy.py b/tests/system_tests_policy.py
index 6559dd9..b89bc41 100644
--- a/tests/system_tests_policy.py
+++ b/tests/system_tests_policy.py
@@ -525,7 +525,7 @@ class InterrouterLinksAllowed(TestCase):
inter_router_port = cls.tester.get_port()
router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port}))
- router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port, 'verifyHostname': 'no'}))
+ router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
# With these configs before DISPATCH-920 the routers never connect
# because the links are disallowed by policy. Before the wait_ready
@@ -1404,7 +1404,7 @@ class ConnectorPolicyMisconfigured(TestCase):
('router', {'mode': 'standalone', 'id': 'QDR.Policy'}),
('listener', {'port': cls.tester.get_port()}),
('policy', {'maxConnections': 100, 'enableVhostPolicy': 'true'}),
- ('connector', {'verifyHostname': 'false', 'name': 'novhost',
+ ('connector', {'name': 'novhost',
'idleTimeoutSeconds': 120, 'saslMechanisms': 'ANONYMOUS',
'host': '127.0.0.1', 'role': 'normal',
'port': cls.remoteListenerPort, 'policyVhost': 'nosuch'
@@ -1598,7 +1598,7 @@ class ConnectorPolicySrcTgt(TestCase):
('router', {'mode': 'standalone', 'id': 'QDR.Policy'}),
('listener', {'port': cls.tester.get_port()}),
('policy', {'maxConnections': 100, 'enableVhostPolicy': 'true'}),
- ('connector', {'verifyHostname': 'false', 'name': 'novhost',
+ ('connector', {'name': 'novhost',
'idleTimeoutSeconds': 120, 'saslMechanisms': 'ANONYMOUS',
'host': '127.0.0.1', 'role': 'normal',
'port': cls.remoteListenerPort, 'policyVhost': 'test'
@@ -1695,7 +1695,7 @@ class ConnectorPolicyNSndrRcvr(TestCase):
('router', {'mode': 'standalone', 'id': 'QDR.Policy'}),
('listener', {'port': cls.tester.get_port()}),
('policy', {'maxConnections': 100, 'enableVhostPolicy': 'true'}),
- ('connector', {'verifyHostname': 'false', 'name': 'novhost',
+ ('connector', {'name': 'novhost',
'idleTimeoutSeconds': 120, 'saslMechanisms': 'ANONYMOUS',
'host': '127.0.0.1', 'role': 'normal',
'port': cls.remoteListenerPort, 'policyVhost': 'test'
diff --git a/tests/system_tests_priority.py b/tests/system_tests_priority.py
index 56c439c..c05954a 100644
--- a/tests/system_tests_priority.py
+++ b/tests/system_tests_priority.py
@@ -158,7 +158,6 @@ class PriorityTests ( TestCase ):
{ 'name' : 'BA_connector',
'role' : 'inter-router',
'port' : A_inter_router_port,
- 'verifyHostname' : 'no',
'linkCapacity' : link_cap,
'stripAnnotations' : 'no'
}
@@ -184,7 +183,6 @@ class PriorityTests ( TestCase ):
{ 'name' : 'CB_connector',
'role' : 'inter-router',
'port' : B_inter_router_port,
- 'verifyHostname' : 'no',
'linkCapacity' : link_cap,
'stripAnnotations' : 'no'
}
diff --git a/tests/system_tests_protocol_settings.py b/tests/system_tests_protocol_settings.py
index 125c5c7..546ffe6 100644
--- a/tests/system_tests_protocol_settings.py
+++ b/tests/system_tests_protocol_settings.py
@@ -310,8 +310,7 @@ class ConnectorSettingsDefaultTest(TestCase):
router('A', 'server',
('listener', {'role': 'inter-router', 'port': inter_router_port}))
router('B', 'client',
- ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port,
- 'verifyHostname': 'no'}))
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('QDR.B')
cls.routers[1].wait_router_connected('QDR.A')
@@ -365,8 +364,7 @@ class ConnectorSettingsNondefaultTest(TestCase):
('listener', {'role': 'inter-router', 'port': inter_router_port}))
router('B', 'client',
('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port,
- 'maxFrameSize': '2048', 'maxSessionFrames': '10', 'maxSessions': '20',
- 'verifyHostname': 'no'}))
+ 'maxFrameSize': '2048', 'maxSessionFrames': '10', 'maxSessions': '20'}))
cls.routers[0].wait_router_connected('QDR.B')
cls.routers[1].wait_router_connected('QDR.A')
diff --git a/tests/system_tests_routing_protocol.py b/tests/system_tests_routing_protocol.py
index 0a7d206..07a929a 100644
--- a/tests/system_tests_routing_protocol.py
+++ b/tests/system_tests_routing_protocol.py
@@ -57,7 +57,7 @@ class RouterTest(TestCase):
inter_router_port = cls.tester.get_port()
router('A', ('listener', {'role': 'inter-router', 'port': inter_router_port}))
- router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port, 'verifyHostname': 'no'}))
+ router('B', ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('B')
cls.routers[1].wait_router_connected('A')
diff --git a/tests/system_tests_sasl_plain.py b/tests/system_tests_sasl_plain.py
index ff6c5d0..7996029 100644
--- a/tests/system_tests_sasl_plain.py
+++ b/tests/system_tests_sasl_plain.py
@@ -424,7 +424,6 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon):
'sslProfile':'server-ssl-profile',
'saslMechanisms':'PLAIN', 'authenticatePeer': 'yes'}),
('sslProfile', {'name': 'server-ssl-profile',
- 'caCertFile': cls.ssl_file('ca-certificate.pem'),
'certFile': cls.ssl_file('server-certificate.pem'),
'privateKeyFile': cls.ssl_file('server-private-key.pem'),
'ciphers': 'ECDH+AESGCM:DH+AESGCM:ECDH+AES256:DH+AES256:ECDH+AES128:DH+AES:RSA+AESGCM:RSA+AES:!aNULL:!MD5:!DSS',
@@ -440,9 +439,8 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon):
super(RouterTestPlainSaslOverSsl, cls).router('Y', [
# This router will act like a client. First an SSL connection will be established and then
# we will have SASL plain authentication over SSL.
- ('connector', {'host': '0.0.0.0', 'role': 'inter-router', 'port': x_listener_port,
+ ('connector', {'host': 'localhost', 'role': 'inter-router', 'port': x_listener_port,
'sslProfile': 'client-ssl-profile',
- 'verifyHostname': 'no',
# Provide a sasl user name and password to connect to QDR.X
'saslMechanisms': 'PLAIN',
'saslUsername': 'test@domain.com',
@@ -452,10 +450,7 @@ class RouterTestPlainSaslOverSsl(RouterTestPlainSaslCommon):
'id': 'QDR.Y'}),
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}),
('sslProfile', {'name': 'client-ssl-profile',
- 'caCertFile': cls.ssl_file('ca-certificate.pem'),
- 'certFile': cls.ssl_file('client-certificate.pem'),
- 'privateKeyFile': cls.ssl_file('client-private-key.pem'),
- 'password': 'client-password'}),
+ 'caCertFile': cls.ssl_file('ca-certificate.pem')}),
])
cls.routers[1].wait_router_connected('QDR.X')
@@ -533,7 +528,7 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon):
def setUpClass(cls):
"""
Tests the verifyHostname property of the connector. The hostname on the server certificate we use is
- A1.Good.Server.domain.com and the host is 0.0.0.0 on the client router initiating the SSL connection.
+ localhost and the host is 127.0.0.1 on the client router initiating the SSL connection.
Since the host names do not match and the verifyHostname is set to true, the client router
will NOT be able make a successful SSL connection the server router.
"""
@@ -557,7 +552,6 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon):
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': cls.tester.get_port(),
'authenticatePeer': 'no'}),
('sslProfile', {'name': 'server-ssl-profile',
- 'caCertFile': cls.ssl_file('ca-certificate.pem'),
'certFile': cls.ssl_file('server-certificate.pem'),
'privateKeyFile': cls.ssl_file('server-private-key.pem'),
'password': 'server-password'}),
@@ -572,7 +566,7 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon):
('connector', {'host': '127.0.0.1', 'role': 'inter-router', 'port': x_listener_port,
'sslProfile': 'client-ssl-profile',
# verifyHostName has been deprecated. We are using it here to test
- # backward compatibility.
+ # backward compatibility. TODO: should add a specific test.
'verifyHostName': 'yes',
'saslMechanisms': 'PLAIN',
'saslUsername': 'test@domain.com',
@@ -582,10 +576,7 @@ class RouterTestVerifyHostNameYes(RouterTestPlainSaslCommon):
'id': 'QDR.Y'}),
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}),
('sslProfile', {'name': 'client-ssl-profile',
- 'caCertFile': cls.ssl_file('ca-certificate.pem'),
- 'certFile': cls.ssl_file('client-certificate.pem'),
- 'privateKeyFile': cls.ssl_file('client-private-key.pem'),
- 'password': 'client-password'}),
+ 'caCertFile': cls.ssl_file('ca-certificate.pem')}),
])
cls.routers[0].wait_ports()
@@ -626,7 +617,7 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
def setUpClass(cls):
"""
Tests the verifyHostname property of the connector. The hostname on the server certificate we use is
- A1.Good.Server.domain.com and the host is 0.0.0.0 on the client router initiating the SSL connection.
+ localhost and the host is 127.0.0.1 on the client router initiating the SSL connection.
Since the host names do not match but verifyHostname is set to false, the client router
will be successfully able to make an SSL connection the server router.
"""
@@ -652,6 +643,7 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
'authenticatePeer': 'no'}),
('sslProfile', {'name': 'server-ssl-profile',
# certDb has been deprecated. We are using it here to test backward compatibility.
+ # TODO: should add a specific test, this one presumably doesnt even use it due to not doing client-certificate authentication
'certDb': cls.ssl_file('ca-certificate.pem'),
'certFile': cls.ssl_file('server-certificate.pem'),
# keyFile has been deprecated. We are using it here to test backward compatibility.
@@ -680,10 +672,7 @@ class RouterTestVerifyHostNameNo(RouterTestPlainSaslCommon):
'id': 'QDR.Y'}),
('listener', {'host': '0.0.0.0', 'role': 'normal', 'port': y_listener_port}),
('sslProfile', {'name': 'client-ssl-profile',
- 'caCertFile': cls.ssl_file('ca-certificate.pem'),
- 'certFile': cls.ssl_file('client-certificate.pem'),
- 'privateKeyFile': cls.ssl_file('client-private-key.pem'),
- 'password': 'client-password'}),
+ 'caCertFile': cls.ssl_file('ca-certificate.pem')}),
])
cls.routers[0].wait_ports()
diff --git a/tests/system_tests_topology.py b/tests/system_tests_topology.py
index 54a71c6..be2cefd 100644
--- a/tests/system_tests_topology.py
+++ b/tests/system_tests_topology.py
@@ -182,7 +182,6 @@ class TopologyTests ( TestCase ):
{ 'name': 'AB_connector',
'role': 'inter-router',
'port': A_inter_router_port,
- 'verifyHostname': 'no',
'cost': cls.A_B_cost,
'stripAnnotations': 'no'
}
@@ -209,7 +208,6 @@ class TopologyTests ( TestCase ):
{ 'name': 'AC_connector',
'role': 'inter-router',
'port': A_inter_router_port,
- 'verifyHostname': 'no',
'cost' : cls.A_C_cost,
'stripAnnotations': 'no'
}
@@ -218,7 +216,6 @@ class TopologyTests ( TestCase ):
{ 'name': 'BC_connector',
'role': 'inter-router',
'port': B_inter_router_port,
- 'verifyHostname': 'no',
'cost' : cls.B_C_cost,
'stripAnnotations': 'no'
}
@@ -239,7 +236,6 @@ class TopologyTests ( TestCase ):
{ 'name': 'AD_connector',
'role': 'inter-router',
'port': A_inter_router_port,
- 'verifyHostname': 'no',
'cost' : cls.A_D_cost,
'stripAnnotations': 'no'
}
@@ -248,7 +244,6 @@ class TopologyTests ( TestCase ):
{ 'name': 'BD_connector',
'role': 'inter-router',
'port': B_inter_router_port,
- 'verifyHostname': 'no',
'cost' : cls.B_D_cost,
'stripAnnotations': 'no'
}
@@ -257,7 +252,6 @@ class TopologyTests ( TestCase ):
{ 'name': 'CD_connector',
'role': 'inter-router',
'port': C_inter_router_port,
- 'verifyHostname': 'no',
'cost' : cls.C_D_cost,
'stripAnnotations': 'no'
}
diff --git a/tests/system_tests_topology_addition.py b/tests/system_tests_topology_addition.py
index 8895c1d..d378462 100644
--- a/tests/system_tests_topology_addition.py
+++ b/tests/system_tests_topology_addition.py
@@ -123,7 +123,6 @@ class TopologyAdditionTests ( TestCase ):
{ 'name': 'AB_connector',
'role': 'inter-router',
'port': cls.inter_router_ports['A'],
- 'verifyHostname': 'no',
'cost': initial_cost,
'stripAnnotations': 'no'
}
@@ -157,7 +156,6 @@ class TopologyAdditionTests ( TestCase ):
{ 'name': 'AC_connector',
'role': 'inter-router',
'port': cls.inter_router_ports['A'],
- 'verifyHostname': 'no',
'cost': int(lower_cost / 2),
'stripAnnotations': 'no',
'linkCapacity' : 1000
@@ -167,7 +165,6 @@ class TopologyAdditionTests ( TestCase ):
{ 'name': 'BC_connector',
'role': 'inter-router',
'port': cls.inter_router_ports['B'],
- 'verifyHostname': 'no',
'cost': int(lower_cost / 2),
'stripAnnotations': 'no',
'linkCapacity' : 1000
@@ -189,7 +186,6 @@ class TopologyAdditionTests ( TestCase ):
{ 'name': 'AD_connector',
'role': 'inter-router',
'port': cls.inter_router_ports['A'],
- 'verifyHostname': 'no',
'cost': int(higher_cost / 2),
'stripAnnotations': 'no',
'linkCapacity' : 1000
@@ -199,7 +195,6 @@ class TopologyAdditionTests ( TestCase ):
{ 'name': 'BD_connector',
'role': 'inter-router',
'port': cls.inter_router_ports['B'],
- 'verifyHostname': 'no',
'cost': int(higher_cost / 2),
'stripAnnotations': 'no',
'linkCapacity' : 1000
diff --git a/tests/system_tests_topology_disposition.py.in b/tests/system_tests_topology_disposition.py.in
index d69031c..146b986 100644
--- a/tests/system_tests_topology_disposition.py.in
+++ b/tests/system_tests_topology_disposition.py.in
@@ -250,7 +250,6 @@ class TopologyDispositionTests ( TestCase ):
{ 'name': 'AB_connector',
'role': 'inter-router',
'port': inter_router_ports [ 'A' ],
- 'verifyHostname': 'no',
'cost': cls.cost['AB'],
'stripAnnotations': 'no',
'linkCapacity' : inter_router_link_capacity
@@ -280,7 +279,6 @@ class TopologyDispositionTests ( TestCase ):
{ 'name': 'AC_connector',
'role': 'inter-router',
'port': inter_router_ports [ 'A' ],
- 'verifyHostname': 'no',
'cost' : cls.cost['AC'],
'stripAnnotations': 'no',
'linkCapacity' : inter_router_link_capacity
@@ -290,7 +288,6 @@ class TopologyDispositionTests ( TestCase ):
{ 'name': 'BC_connector',
'role': 'inter-router',
'port': inter_router_ports [ 'B' ],
- 'verifyHostname': 'no',
'cost' : cls.cost['BC'],
'stripAnnotations': 'no',
'linkCapacity' : inter_router_link_capacity
@@ -313,7 +310,6 @@ class TopologyDispositionTests ( TestCase ):
{ 'name': 'AD_connector',
'role': 'inter-router',
'port': inter_router_ports [ 'A' ],
- 'verifyHostname': 'no',
'cost' : cls.cost['AD'],
'stripAnnotations': 'no',
'linkCapacity' : inter_router_link_capacity
@@ -323,7 +319,6 @@ class TopologyDispositionTests ( TestCase ):
{ 'name': 'AD2_connector',
'role': 'inter-router',
'port': inter_router_ports [ 'A' ],
- 'verifyHostname': 'no',
'cost' : cls.cost['AD2'],
'stripAnnotations': 'no',
'linkCapacity' : inter_router_link_capacity
@@ -333,7 +328,6 @@ class TopologyDispositionTests ( TestCase ):
{ 'name': 'BD_connector',
'role': 'inter-router',
'port': inter_router_ports [ 'B' ],
- 'verifyHostname': 'no',
'cost' : cls.cost['BD'],
'stripAnnotations': 'no',
'linkCapacity' : inter_router_link_capacity
@@ -343,7 +337,6 @@ class TopologyDispositionTests ( TestCase ):
{ 'name': 'CD_connector',
'role': 'inter-router',
'port': inter_router_ports [ 'C' ],
- 'verifyHostname': 'no',
'cost' : cls.cost['CD'],
'stripAnnotations': 'no',
'linkCapacity' : inter_router_link_capacity
diff --git a/tests/system_tests_two_routers.py b/tests/system_tests_two_routers.py
index 02fae99..0419fdb 100644
--- a/tests/system_tests_two_routers.py
+++ b/tests/system_tests_two_routers.py
@@ -97,8 +97,7 @@ class TwoRouterTest(TestCase):
('listener', {'role': 'inter-router', 'port': inter_router_port}))
router('B', 'client',
- ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port,
- 'verifyHostname': 'no'}))
+ ('connector', {'name': 'connectorToA', 'role': 'inter-router', 'port': inter_router_port}))
cls.routers[0].wait_router_connected('QDR.B')
cls.routers[1].wait_router_connected('QDR.A')
@@ -1837,8 +1836,7 @@ class StreamingLinkScrubberTest(TestCase):
router('B',
[('connector', {'name': 'connectorToA', 'role':
'inter-router',
- 'port': inter_router_port,
- 'verifyHostname': 'no'})])
+ 'port': inter_router_port})])
cls.RouterB = cls.routers[-1]
cls.RouterB.listener = cls.RouterB.addresses[0]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org