summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/tests/reliable_replication_test
diff options
context:
space:
mode:
Diffstat (limited to 'qpid/cpp/src/tests/reliable_replication_test')
-rwxr-xr-xqpid/cpp/src/tests/reliable_replication_test18
1 files changed, 5 insertions, 13 deletions
diff --git a/qpid/cpp/src/tests/reliable_replication_test b/qpid/cpp/src/tests/reliable_replication_test
index 6f1d5882a5..273e482da0 100755
--- a/qpid/cpp/src/tests/reliable_replication_test
+++ b/qpid/cpp/src/tests/reliable_replication_test
@@ -65,12 +65,9 @@ receive() {
}
bounce_link() {
- echo "Destroying link..."
$PYTHON_COMMANDS/qpid-route link del "localhost:$BROKER_B" "localhost:$BROKER_A"
- echo "Link destroyed; recreating route..."
- sleep 2
+# sleep 2
$PYTHON_COMMANDS/qpid-route --ack 500 queue add "localhost:$BROKER_B" "localhost:$BROKER_A" replication replication
- echo "Route re-established"
}
if test -d ${PYTHON_DIR} && test -e $REPLICATING_LISTENER_LIB && test -e $REPLICATION_EXCHANGE_LIB ; then
@@ -78,16 +75,11 @@ if test -d ${PYTHON_DIR} && test -e $REPLICATING_LISTENER_LIB && test -e $REPLIC
for i in `seq 1 100000`; do echo Message $i; done > replicated.expected
send &
receive &
- for i in `seq 1 5`; do sleep 10; bounce_link; done;
+ for i in `seq 1 3`; do sleep 1; bounce_link; done;
wait
#check that received list is identical to sent list
- diff replicated.actual replicated.expected || FAIL=1
- if [[ $FAIL ]]; then
- echo reliable replication test failed: expectations not met!
- exit 1
- else
- echo replication reliable in the face of link failures
- rm -f replication.actual replication.expected replication-source.log replication-dest.log qpidd-repl.port
- fi
+ diff replicated.actual replicated.expected || exit 1
+ rm -f replication.actual replication.expected replication-source.log replication-dest.log qpidd-repl.port
+ true
fi