From 798fe819fc30da15d3fefc683537062103684ca8 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Sun, 24 Oct 2010 23:52:12 +0000 Subject: QPID-2910: Small fix for python timeout tests Patch submitted by Sorin S git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1026917 13f79535-47bb-0310-9956-ffa450edef68 --- python/qpid/messaging/endpoints.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'python/qpid/messaging/endpoints.py') diff --git a/python/qpid/messaging/endpoints.py b/python/qpid/messaging/endpoints.py index 886b7f1706..b8101b76e6 100644 --- a/python/qpid/messaging/endpoints.py +++ b/python/qpid/messaging/endpoints.py @@ -124,12 +124,14 @@ class Connection(Endpoint): if isinstance(url, basestring): url = URL(url) self.host = url.host - if url.scheme == url.AMQP: + if options.has_key("transport"): + self.transport = options.get("transport") + elif url.scheme == url.AMQP: self.transport = "tcp" elif url.scheme == url.AMQPS: self.transport = "ssl" else: - self.transport = options.get("transport", "tcp") + self.transport = "tcp" if self.transport in ("ssl", "tcp+tls"): self.port = default(url.port, options.get("port", AMQPS_PORT)) else: -- cgit v1.2.1