diff options
| author | Gordon Sim <gsim@apache.org> | 2008-06-02 09:33:58 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-06-02 09:33:58 +0000 |
| commit | 8273074b01048bd456e5fe2b41c7ce52c9a9bacf (patch) | |
| tree | ec2a686ab4f4da9784dde57a33be77204c2602ae /qpid/cpp/src/tests/federated_topic_test | |
| parent | c93394ec3d27c1817d158d68d30ba1b4de46385c (diff) | |
| download | qpid-python-8273074b01048bd456e5fe2b41c7ce52c9a9bacf.tar.gz | |
Minor updates to tests:
* sync on commit in transactional topic test
* disable loading of modules from automated test to preserve isolation
* update federated topic test script in line with command line option changes
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@662373 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/federated_topic_test')
| -rwxr-xr-x | qpid/cpp/src/tests/federated_topic_test | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/qpid/cpp/src/tests/federated_topic_test b/qpid/cpp/src/tests/federated_topic_test index 9e769b5de5..dbb4a2a133 100755 --- a/qpid/cpp/src/tests/federated_topic_test +++ b/qpid/cpp/src/tests/federated_topic_test @@ -27,11 +27,11 @@ PYTHON_DIR=${MY_DIR}/../../../python trap stop_brokers EXIT start_brokers() { - ${MY_DIR}/../qpidd --daemon --port 0 --no-data-dir --auth no > qpidd.port + ${MY_DIR}/../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no > qpidd.port PORT_A=`cat qpidd.port` - ${MY_DIR}/../qpidd --daemon --port 0 --no-data-dir --auth no > qpidd.port + ${MY_DIR}/../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no > qpidd.port PORT_B=`cat qpidd.port` - ${MY_DIR}/../qpidd --daemon --port 0 --no-data-dir --auth no > qpidd.port + ${MY_DIR}/../qpidd --daemon --port 0 --no-module-dir --no-data-dir --auth no > qpidd.port PORT_C=`cat qpidd.port` } @@ -64,16 +64,16 @@ setup_routes() { BROKER_C="localhost:$PORT_C" export PYTHONPATH=$PYTHON_DIR:$PYTHONPATH echo "Establishing routes for topic..." - $PYTHON_DIR/commands/qpid-route -s ~/qpid/trunk/qpid/specs/amqp.0-10.xml add $BROKER_B $BROKER_A amq.topic topic_control B B - $PYTHON_DIR/commands/qpid-route -s ~/qpid/trunk/qpid/specs/amqp.0-10.xml add $BROKER_C $BROKER_B amq.topic topic_control C C + $PYTHON_DIR/commands/qpid-route add $BROKER_B $BROKER_A amq.topic topic_control B B + $PYTHON_DIR/commands/qpid-route add $BROKER_C $BROKER_B amq.topic topic_control C C echo "linked A->B->C" - $PYTHON_DIR/commands/qpid-route -s ~/qpid/trunk/qpid/specs/amqp.0-10.xml add $BROKER_B $BROKER_C amq.topic topic_control B B - $PYTHON_DIR/commands/qpid-route -s ~/qpid/trunk/qpid/specs/amqp.0-10.xml add $BROKER_A $BROKER_B amq.topic topic_control A A + $PYTHON_DIR/commands/qpid-route add $BROKER_B $BROKER_C amq.topic topic_control B B + $PYTHON_DIR/commands/qpid-route add $BROKER_A $BROKER_B amq.topic topic_control A A echo "linked C->B->A" echo "Establishing routes for response queue..." - $PYTHON_DIR/commands/qpid-route -s ~/qpid/trunk/qpid/specs/amqp.0-10.xml add $BROKER_B $BROKER_C amq.direct response B B - $PYTHON_DIR/commands/qpid-route -s ~/qpid/trunk/qpid/specs/amqp.0-10.xml add $BROKER_A $BROKER_B amq.direct response A A + $PYTHON_DIR/commands/qpid-route add $BROKER_B $BROKER_C amq.direct response B B + $PYTHON_DIR/commands/qpid-route add $BROKER_A $BROKER_B amq.direct response A A echo "linked C->B->A" } |