diff --git a/basice2e/run.sh b/basice2e/run.sh index d7573b13f75e807e72fe501409e4cc99857ec6d8..16ea5bffd27b309b6105b221fab7b23b81247f3b 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -263,6 +263,19 @@ then wait $PIDVAL wait $PIDVAL2 + echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)" + CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\"" + eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true & + PIDVAL=$! + echo "$CLIENTCMD -- $PIDVAL" + CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\"" + eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true & + PIDVAL2=$! + echo "$CLIENTCMD -- $PIDVAL" + wait $PIDVAL + wait $PIDVAL2 + + fi # Non-precanned E2E user messaging @@ -381,6 +394,18 @@ echo "$CLIENTCMD -- $PIDVAL" wait $PIDVAL wait $PIDVAL2 +echo "FORCING MESSAGE PICKUP RETRY... " +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\"" +eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true & +PIDVAL=$! +echo "$CLIENTCMD -- $PIDVAL" +CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\"" +eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true & +PIDVAL2=$! +echo "$CLIENTCMD -- $PIDVAL" +wait $PIDVAL +wait $PIDVAL2 + # Single-use test: client53 sends message to client52; client52 responds with # the same message in the set number of message parts