diff options
| author | Alan Conway <aconway@apache.org> | 2014-02-06 18:14:53 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2014-02-06 18:14:53 +0000 |
| commit | fdbfa5fba57db0802a9cbff5dc928f2679761c49 (patch) | |
| tree | 3bbd12b0ace87ebf35c39f85236f388cb2c216a6 | |
| parent | 7311e5e071eed1b484f48a39bb4e5f776f5345de (diff) | |
| download | qpid-python-fdbfa5fba57db0802a9cbff5dc928f2679761c49.tar.gz | |
Author: Alan Conway <aconway@redhat.com>
--- log message follows this
NO-JIRA: Remove use of python built-in 'next', not available before python 2.6.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1565382 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 2 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/ha_test.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index c7fcf2c3af..4b6820e4fd 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -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, diff --git a/qpid/cpp/src/tests/ha_test.py b/qpid/cpp/src/tests/ha_test.py index 4606fab746..748c8ef0c1 100755 --- a/qpid/cpp/src/tests/ha_test.py +++ b/qpid/cpp/src/tests/ha_test.py @@ -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 ] |