diff options
| author | Pavel Moravec <pmoravec@apache.org> | 2014-06-26 08:41:05 +0000 |
|---|---|---|
| committer | Pavel Moravec <pmoravec@apache.org> | 2014-06-26 08:41:05 +0000 |
| commit | beadf1e2c88cac3ffe5f94fbba9f711aaeea8007 (patch) | |
| tree | 0b102a4411f071067476e79997fa9a4faeb834f0 /cpp/src/tests | |
| parent | a0595eaa03dc2120aaeb8e5d328451a7a8b25b52 (diff) | |
| download | qpid-python-beadf1e2c88cac3ffe5f94fbba9f711aaeea8007.tar.gz | |
[no JIRA]: brokertest to set connection option 'protocol' only for SWIG client on AMQP1.0
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1605703 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests')
| -rw-r--r-- | cpp/src/tests/brokertest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/tests/brokertest.py b/cpp/src/tests/brokertest.py index 9d77baebaf..44824fe67e 100644 --- a/cpp/src/tests/brokertest.py +++ b/cpp/src/tests/brokertest.py @@ -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 |