You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2014/02/06 19:14:53 UTC
svn commit: r1565382 - in /qpid/trunk/qpid/cpp/src/tests: brokertest.py
ha_test.py
Author: aconway
Date: Thu Feb 6 18:14:53 2014
New Revision: 1565382
URL: http://svn.apache.org/r1565382
Log:
Author: Alan Conway <ac...@redhat.com>
--- log message follows this
NO-JIRA: Remove use of python built-in 'next', not available before python 2.6.
Modified:
qpid/trunk/qpid/cpp/src/tests/brokertest.py
qpid/trunk/qpid/cpp/src/tests/ha_test.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=1565382&r1=1565381&r2=1565382&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/brokertest.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/brokertest.py Thu Feb 6 18:14:53 2014
@@ -278,7 +278,7 @@ class Broker(Popen):
cmd += ["--log-to-stderr=no"]
# Add default --log-enable arguments unless args already has --log arguments.
- if not next((l for l in args if l.startswith("--log")), None):
+ if not [l for l in args if l.startswith("--log")]:
args += ["--log-enable=info+"]
if test_store: cmd += ["--load-module", BrokerTest.test_store_lib,
Modified: qpid/trunk/qpid/cpp/src/tests/ha_test.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/ha_test.py?rev=1565382&r1=1565381&r2=1565382&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/ha_test.py (original)
+++ qpid/trunk/qpid/cpp/src/tests/ha_test.py Thu Feb 6 18:14:53 2014
@@ -137,7 +137,7 @@ class HaBroker(Broker):
"--max-negotiate-time=1000",
"--ha-cluster=%s"%ha_cluster]
# Add default --log-enable arguments unless args already has --log arguments.
- if not next((l for l in args if l.startswith("--log")), None):
+ if not [l for l in args if l.startswith("--log")]:
args += ["--log-enable=info+", "--log-enable=debug+:ha::"]
if ha_replicate is not None:
args += [ "--ha-replicate=%s"%ha_replicate ]
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org