Author: pmoravec
Date: Thu Jun 26 08:41:05 2014
New Revision: 1605703
URL: http://svn.apache.org/r1605703
Log:
[no JIRA]: brokertest to set connection option 'protocol' only for SWIG client
on AMQP1.0
Modified:
qpid/trunk/qpid/cpp/src/tests/brokertest.py
Modified: qpid/trunk/qpid/cpp/src/tests/brokertest.py
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/brokertest.py?rev=1605703&r1=1605702&r2=1605703&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/brokertest.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/brokertest.py Thu Jun 26 08:41:05 2014
@@ -344,9 +344,11 @@ class Broker(Popen):
@param native if True force use of the native qpid.messaging client
even if swig client is available.
"""
- if self.test.protocol: kwargs.setdefault("protocol",
self.test.protocol)
if native: connection_class = qpid.messaging.Connection
- else: connection_class = qm.Connection
+ else:
+ connection_class = qm.Connection
+ if (self.test.protocol and qm == qpid_messaging):
+ kwargs.setdefault("protocol", self.test.protocol)
return connection_class.establish(self.host_port(), timeout=timeout,
**kwargs)
@property
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
