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 | d88f8f4b8996c4eb27627ca2810cf0231e7c0229 (patch) | |
| tree | fee838978802a7fbf525f5a62a00295afc5894cd /qpid/cpp/src | |
| parent | 73e49b5fc7ebcb9235265f648dbb7f3cc522752a (diff) | |
| download | qpid-python-d88f8f4b8996c4eb27627ca2810cf0231e7c0229.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@1605703 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 9d77baebaf..44824fe67e 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/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 |