Author: gsim
Date: Mon Jun 2 02:33:58 2008
New Revision: 662373
URL: http://svn.apache.org/viewvc?rev=662373&view=rev
Log:
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
Modified:
incubator/qpid/trunk/qpid/cpp/src/tests/federated_topic_test
incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests
incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/federated_topic_test
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/federated_topic_test?rev=662373&r1=662372&r2=662373&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/federated_topic_test (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/federated_topic_test Mon Jun 2
02:33:58 2008
@@ -27,11 +27,11 @@
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 @@
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"
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests?rev=662373&r1=662372&r2=662373&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/run_federation_tests Mon Jun 2
02:33:58 2008
@@ -6,9 +6,9 @@
trap stop_brokers EXIT
start_brokers() {
- ../qpidd --daemon --port 0 --no-data-dir --auth no > qpidd.port
+ ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no >
qpidd.port
LOCAL_PORT=`cat qpidd.port`
- ../qpidd --daemon --port 0 --no-data-dir --auth no > qpidd.port
+ ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no >
qpidd.port
REMOTE_PORT=`cat qpidd.port`
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/start_broker
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/start_broker?rev=662373&r1=662372&r2=662373&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/start_broker (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/start_broker Mon Jun 2 02:33:58
2008
@@ -1,4 +1,4 @@
#!/bin/sh
rm -f qpidd.vglog qpidd.log
test -n "$VALGRIND" && VALGRIND="$VALGRIND --log-file-exactly=qpidd.vglog --"
-exec libtool --mode=execute $VALGRIND ../qpidd --auth no --daemon --port 0
--log-output qpidd.log "$@" > qpidd.port
+exec libtool --mode=execute $VALGRIND ../qpidd --auth no --no-module-dir
--daemon --port 0 --log-output qpidd.log "$@" > qpidd.port
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp?rev=662373&r1=662372&r2=662373&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_listener.cpp Mon Jun 2
02:33:58 2008
@@ -184,7 +184,7 @@
msg.getHeaders().setString("TYPE", "REPORT");
session.messageTransfer(arg::destination="amq.direct", arg::content=msg,
arg::acceptMode=1);
if(transactional){
- session.txCommit();
+ sync(session).txCommit();
}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp?rev=662373&r1=662372&r2=662373&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/topic_publisher.cpp Mon Jun 2
02:33:58 2008
@@ -171,7 +171,7 @@
reportRequest.getHeaders().setString("TYPE", "REPORT_REQUEST");
session.messageTransfer(arg::content=reportRequest,
arg::destination="amq.topic", arg::acceptMode=1);
if(transactional){
- session.txCommit();
+ sync(session).txCommit();
}
//wait for a response from each listener (TODO, could log these)
for (int i = 0; i < listeners; i++) {
@@ -179,7 +179,7 @@
}
if(transactional){
- session.txCommit();
+ sync(session).txCommit();
}
AbsTime finish = now();
