Author: aconway
Date: Tue Apr 8 15:10:12 2014
New Revision: 1585755
URL: http://svn.apache.org/r1585755
Log:
Author: Alan Conway <[email protected]>
--- log message follows this
QPID-5560: Remove use of python if expression, not available in older python
(2.4)
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=1585755&r1=1585754&r2=1585755&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/brokertest.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/brokertest.py Tue Apr 8 15:10:12 2014
@@ -488,8 +488,9 @@ class BrokerTest(TestCase):
os.makedirs(self.dir)
os.chdir(self.dir)
self.teardown_list = [] # things to tear down at end of
test
-
- self.protocol = defs.get("PROTOCOL") or ("amqp1.0" if qpid_messaging
else "amqp0-10")
+ if qpid_messaging: default_protocol="amqp1.0"
+ else: default_protocol="amqp0-10"
+ self.protocol = defs.get("PROTOCOL") or default_protocol
self.tx_protocol = "amqp0-10" # Transactions not yet supported over 1.0
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
