diff options
| author | Flavio Percoco <flaper87@gmail.com> | 2015-06-23 16:57:13 +0200 |
|---|---|---|
| committer | Oleksii Zamiatin <ozamiatin@mirantis.com> | 2015-07-06 12:19:14 +0000 |
| commit | 4073851bf83d75bb1060be9ed1d7f3895470b9f5 (patch) | |
| tree | b6ac48c2092256281eef700025d218ba7ca0ff9e | |
| parent | 73cd49129f0ce2a799938b4fec9dcd847b0a77ad (diff) | |
| download | oslo-messaging-4073851bf83d75bb1060be9ed1d7f3895470b9f5.tar.gz | |
Fix qpid's functional gate
The loggin verbosity changed in 0.32 which our gate is pulling from the
updates repository. This patch updates the script to make it work again.
Closes-bug: #1468917
Change-Id: I88a1bc794246beb156d4301bd503fa51a7cd2cce
(cherry picked from commit 079c04f0d06539f3507c772ccc68807a6d01a73a)
| -rwxr-xr-x | setup-test-env-qpid.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/setup-test-env-qpid.sh b/setup-test-env-qpid.sh index caf9c38..5972718 100755 --- a/setup-test-env-qpid.sh +++ b/setup-test-env-qpid.sh @@ -14,10 +14,10 @@ cat > ${DATADIR}/qpidd.conf <<EOF port=65123 acl-file=${DATADIR}/qpidd.acl sasl-config=${DATADIR}/sasl2 -log-to-file=${DATADIR}/log ${LIBACL} mgmt-enable=yes auth=yes +log-to-stderr=no # Used by AMQP1.0 only queue-patterns=exclusive @@ -42,13 +42,12 @@ EOF echo secretqpid | saslpasswd2 -c -p -f ${DATADIR}/qpidd.sasldb -u QPID stackqpid QPIDD=$(which qpidd 2>/dev/null) -[ ! -x $QPIDD ] && /usr/sbin/qpidd mkfifo ${DATADIR}/out -$QPIDD --config ${DATADIR}/qpidd.conf &> ${DATADIR}/out & +$QPIDD --log-enable info+ --log-to-file ${DATADIR}/out --config ${DATADIR}/qpidd.conf & wait_for_line "Broker .*running" "error" ${DATADIR}/out # Earlier failure if qpid-config is avialable -[ -x "$(which qpid-config)" ] && qpid-config -b stackqpid/secretqpid@localhost:65123 +[ -x "$(which qpid-config)" ] && qpid-config -b stackqpid/secretqpid@localhost:65123 &>/dev/null $* |