summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/sasl_fed
diff options
context:
space:
mode:
authorTed Ross <tross@apache.org>2012-02-22 16:41:55 +0000
committerTed Ross <tross@apache.org>2012-02-22 16:41:55 +0000
commit3314a5cb4d14e94ed8fa29a1ba6348d10d27fdcf (patch)
tree52ddc4ee1c0424de91ded89b1cc27884cfa58134 /qpid/cpp/src/tests/sasl_fed
parent99104dde3f0718b4f9a3aff3427bab6a818fb41b (diff)
downloadqpid-python-3314a5cb4d14e94ed8fa29a1ba6348d10d27fdcf.tar.gz
QPID-3851 - Unified common CLI options for qpid-config and qpid-stat.
Also in this commit: qpid-config was converted to use the messaging-based qmf2 library. It no longer has a dependency on the qmf library. The CLI tests were also ported to the faster library. CLI test time prior to this commit: 2 minutes 12 seconds CLI test time after this commit: 12.5 seconds Other items in qpid-config and qpid-stat: - The deprecated LVQ options (lqv, lqv-no-browse) were removed from qpid-config. - A new option, --lvq-key, was added to qpid-config to support the new LVQ configuration. The docs and tests were updated to match. - qpid-stat was updated so that 'qpid-stat -q <queue-name>' prints full details from the specified queue. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1292388 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/sasl_fed')
-rwxr-xr-xqpid/cpp/src/tests/sasl_fed16
1 files changed, 8 insertions, 8 deletions
diff --git a/qpid/cpp/src/tests/sasl_fed b/qpid/cpp/src/tests/sasl_fed
index 884c44177c..9dc2dd46e2 100755
--- a/qpid/cpp/src/tests/sasl_fed
+++ b/qpid/cpp/src/tests/sasl_fed
@@ -90,23 +90,23 @@ EXCHANGE_NAME=sasl_fedex
#--------------------------------------------------
#echo " add exchanges"
#--------------------------------------------------
-$QPID_CONFIG_EXEC -a localhost:$broker_1_port add exchange direct $EXCHANGE_NAME
-$QPID_CONFIG_EXEC -a localhost:$broker_2_port add exchange direct $EXCHANGE_NAME
+$QPID_CONFIG_EXEC -b localhost:$broker_1_port add exchange direct $EXCHANGE_NAME
+$QPID_CONFIG_EXEC -b localhost:$broker_2_port add exchange direct $EXCHANGE_NAME
#--------------------------------------------------
#echo " add queues"
#--------------------------------------------------
-$QPID_CONFIG_EXEC -a localhost:$broker_1_port add queue $QUEUE_NAME
-$QPID_CONFIG_EXEC -a localhost:$broker_2_port add queue $QUEUE_NAME
+$QPID_CONFIG_EXEC -b localhost:$broker_1_port add queue $QUEUE_NAME
+$QPID_CONFIG_EXEC -b localhost:$broker_2_port add queue $QUEUE_NAME
sleep 5
#--------------------------------------------------
#echo " create bindings"
#--------------------------------------------------
-$QPID_CONFIG_EXEC -a localhost:$broker_1_port bind $EXCHANGE_NAME $QUEUE_NAME $ROUTING_KEY
-$QPID_CONFIG_EXEC -a localhost:$broker_2_port bind $EXCHANGE_NAME $QUEUE_NAME $ROUTING_KEY
+$QPID_CONFIG_EXEC -b localhost:$broker_1_port bind $EXCHANGE_NAME $QUEUE_NAME $ROUTING_KEY
+$QPID_CONFIG_EXEC -b localhost:$broker_2_port bind $EXCHANGE_NAME $QUEUE_NAME $ROUTING_KEY
sleep 5
@@ -130,13 +130,13 @@ sleep 5
#--------------------------------------------------
#echo " Examine Broker $broker_1_port"
#--------------------------------------------------
-broker_1_message_count=`$PYTHON_COMMANDS/qpid-stat -q localhost:$broker_1_port | grep sasl_fed_queue | awk '{print $2}'`
+broker_1_message_count=`$PYTHON_COMMANDS/qpid-stat -q -b localhost:$broker_1_port | grep sasl_fed_queue | awk '{print $2}'`
#echo " "
#--------------------------------------------------
#echo " Examine Broker $broker_2_port"
#--------------------------------------------------
-broker_2_message_count=`$PYTHON_COMMANDS/qpid-stat -q localhost:$broker_2_port | grep sasl_fed_queue | awk '{print $2}'`
+broker_2_message_count=`$PYTHON_COMMANDS/qpid-stat -q -b localhost:$broker_2_port | grep sasl_fed_queue | awk '{print $2}'`
#echo " "
#--------------------------------------------------