diff options
| author | Alan Conway <aconway@apache.org> | 2012-02-17 14:54:46 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2012-02-17 14:54:46 +0000 |
| commit | 0ae82e5d20094e25c41adc3e3924f17984a7bce9 (patch) | |
| tree | 8713b63bcb6cba8550628af3874d259ff40c6a0d /qpid/cpp/src/tests/reliable_replication_test | |
| parent | 454855a993904238a5401f145326943159f97532 (diff) | |
| download | qpid-python-0ae82e5d20094e25c41adc3e3924f17984a7bce9.tar.gz | |
QPID-3603: Merge new HA foundations.
Merged from qpid-3603-7. This is basic support for the new HA approach.
For information & limitations see qpid/cpp/design_docs/new-ha-design.txt.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1245587 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests/reliable_replication_test')
| -rwxr-xr-x | qpid/cpp/src/tests/reliable_replication_test | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/qpid/cpp/src/tests/reliable_replication_test b/qpid/cpp/src/tests/reliable_replication_test index 6f1d5882a5..1f1dac5f2d 100755 --- a/qpid/cpp/src/tests/reliable_replication_test +++ b/qpid/cpp/src/tests/reliable_replication_test @@ -65,12 +65,8 @@ 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 $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 +74,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 |