From 99b4cdaeb73e904b470fa1dae1cc16ab9791b060 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 8 Apr 2014 15:10:12 +0000 Subject: Author: Alan Conway --- log message follows this QPID-5560: Remove use of python if expression, not available in older python (2.4) git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1585755 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/tests/brokertest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qpid/cpp/src/tests') diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 4e5c255a1a..c93a086301 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -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 -- cgit v1.2.1