openstack
/
oslo.messaging
Code Issues Proposed changes

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 079c04f0d0)
This commit is contained in:
Flavio Percoco 2015-06-23 16:57:13 +02:00 committed by Oleksii Zamiatin
parent 73cd49129f
commit 4073851bf8
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
setup-test-env-qpid.sh
View File

@ -14,10 +14,10 @@ cat > ${DATADIR}/qpidd.conf <<EOF
port=65123 port=65123
acl-file=${DATADIR}/qpidd.acl acl-file=${DATADIR}/qpidd.acl
sasl-config=${DATADIR}/sasl2 sasl-config=${DATADIR}/sasl2
log-to-file=${DATADIR}/log
${LIBACL} ${LIBACL}
mgmt-enable=yes mgmt-enable=yes
auth=yes auth=yes
log-to-stderr=no
# Used by AMQP1.0 only # Used by AMQP1.0 only
queue-patterns=exclusive queue-patterns=exclusive
@ -42,13 +42,12 @@ EOF
echo secretqpid | saslpasswd2 -c -p -f ${DATADIR}/qpidd.sasldb -u QPID stackqpid echo secretqpid | saslpasswd2 -c -p -f ${DATADIR}/qpidd.sasldb -u QPID stackqpid
QPIDD=$(which qpidd 2>/dev/null) QPIDD=$(which qpidd 2>/dev/null)
[ ! -x $QPIDD ] && /usr/sbin/qpidd
mkfifo ${DATADIR}/out 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 wait_for_line "Broker .*running" "error" ${DATADIR}/out
# Earlier failure if qpid-config is avialable # 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
$* $*