diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 15:30:50 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 15:30:50 +0000 |
| commit | 0c801f4ef8be29a0a756bce67651cac7f583a525 (patch) | |
| tree | 94a8268fc22ae62f61b77ba59de1aba044d7d270 /qpid/cpp/src/tests | |
| parent | 3ed7df0bb26d82b63a2d0a2f47db79693220cb02 (diff) | |
| download | qpid-python-0c801f4ef8be29a0a756bce67651cac7f583a525.tar.gz | |
QPID-4931: Only allow broker to listen to a single address if "--port 0" specified
- If more than one address is specified or implied by the defaults the broker
will log a warning
- This is intended to avoid testing problems where the broker fails to connect
to the port of subsequent listening addresses
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494656 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/brokertest.py | 2 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/interlink_tests.py | 1 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/ipv6_test | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/brokertest.py b/qpid/cpp/src/tests/brokertest.py index 535d7220d7..fbbaadc350 100644 --- a/qpid/cpp/src/tests/brokertest.py +++ b/qpid/cpp/src/tests/brokertest.py @@ -265,7 +265,7 @@ class Broker(Popen): if BrokerTest.sql_clfs_store_lib: args = args + ['--load-module', BrokerTest.sql_clfs_store_lib] args = args + ['--catalog', BrokerTest.sql_catalog] - cmd = [BrokerTest.qpidd_exec, "--port", port, "--no-module-dir"] + args + cmd = [BrokerTest.qpidd_exec, "--port", port, "--interface", "127.0.0.1", "--no-module-dir"] + args if not "--auth" in args: cmd.append("--auth=no") if wait != None: cmd += ["--wait", str(wait)] diff --git a/qpid/cpp/src/tests/interlink_tests.py b/qpid/cpp/src/tests/interlink_tests.py index 9900ef45f1..129283ac24 100755 --- a/qpid/cpp/src/tests/interlink_tests.py +++ b/qpid/cpp/src/tests/interlink_tests.py @@ -250,7 +250,6 @@ class AmqpBrokerTest(BrokerTest): def amqp_broker(self): assert BrokerTest.amqp_lib, "Cannot locate AMQP 1.0 plug-in" args = ["--load-module", BrokerTest.amqp_lib, - "--interface=127.0.0.1", "--max-negotiate-time=600000", "--log-enable=trace+:Protocol", "--log-enable=info+"] diff --git a/qpid/cpp/src/tests/ipv6_test b/qpid/cpp/src/tests/ipv6_test index f47e721513..18bb34daa6 100755 --- a/qpid/cpp/src/tests/ipv6_test +++ b/qpid/cpp/src/tests/ipv6_test @@ -44,7 +44,7 @@ trap cleanup EXIT error() { echo $*; exit 1; } # Don't need --no-module-dir or --no-data-dir as they are set as env vars in test_env.sh -COMMON_OPTS="--daemon --auth no --config $CONFIG" +COMMON_OPTS="--interface [::1] --daemon --auth no --config $CONFIG" # Record all broker ports started unset PORTS |