Make previous test more robust, add some comments

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@799614 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 12 insertions, 1 deletions

diff --git a/cpp/src/tests/replication_test b/cpp/src/tests/replication_test
index 5ae4cf7806..8b3022b260 100755
--- a/cpp/src/tests/replication_test
+++ b/cpp/src/tests/replication_test
@@ -56,10 +56,12 @@ if test -d ${PYTHON_DIR} && test -f ../.libs/replicating_listener.so && test -f
     $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_A" add queue queue-b --generate-queue-events 2
     $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_A" add queue queue-c --generate-queue-events 1
     $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_A" add queue queue-d --generate-queue-events 2
+    $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_A" add queue queue-e --generate-queue-events 1
 
     $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_B" add queue queue-a
     $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_B" add queue queue-b
     $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_B" add queue queue-c
+    $PYTHON_DIR/commands/qpid-config -a "localhost:$BROKER_B" add queue queue-e
     #queue-d deliberately not declared on DR; this error case should be handled
 
     #publish and consume from test queues on broker A:
@@ -89,6 +91,12 @@ if test -d ${PYTHON_DIR} && test -f ../.libs/replicating_listener.so && test -f
     ./receiver --port $BROKER_A --queue queue-c --messages 10 > /dev/null
     ./receiver --port $BROKER_A --queue queue-d > /dev/null
     
+
+    # What we are doing is putting a message on the end of repliaction queue & waiting for it on remote side
+    # making sure all the messages have been flushed from the replication queue.
+    echo dummy | ./sender --port $BROKER_A --routing-key queue-e --send-eos 1
+    ./receiver --port $BROKER_B --queue queue-e --messages 1 > /dev/null
+
     #shutdown broker A then check that broker Bs versions of the queues are as expected
     ../qpidd -q --port $BROKER_A
     unset BROKER_A
@@ -133,10 +141,13 @@ if test -d ${PYTHON_DIR} && test -f ../.libs/replicating_listener.so && test -f
 
     ./sender --port $BROKER_A --routing-key queue-e --send-eos 1 < queue-e-input.repl
     ./receiver --port $BROKER_A --queue queue-e --messages 10 > /dev/null
-    # now check offsets working
+    
+    # What we are doing is putting a message on the end of repliaction queue & waiting for it on remote side
+    # making sure all the messages have been flushed from the replication queue.
     echo dummy | ./sender --port $BROKER_A --routing-key queue-d --send-eos 1
     ./receiver --port $BROKER_B --queue queue-d --messages 1 > /dev/null
 
+    # now check offsets working
     ../qpidd -q --port $BROKER_B
     unset BROKER_B
     ../qpidd --daemon --port 0 --no-data-dir --no-module-dir --auth no --load-module ../.libs/replication_exchange.so  --log-enable info+ --log-to-file replication-dest.log  --log-to-stderr 0 > qpidd.port