Skip to content
Snippets Groups Projects
Commit 082b0004 authored by Josh Brooks's avatar Josh Brooks
Browse files

Clean up and add more messages for message retry test

parent a730595f
No related branches found
No related tags found
1 merge request!4Release
Hide whitespace changes
Inline Side-by-side
basice2e/clients.goldoutput/client20.txt
+ 22
− 2
View file @ 082b0004
...@@ -3,20 +3,40 @@ Sent: Hello from 20, without E2E Encryption ...@@ -3,20 +3,40 @@ Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Received 5 Received 10
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Message received: Hello from 21, without E2E Encryption Message received: Hello from 21, without E2E Encryption
Received 5 Received 10
basice2e/clients.goldoutput/client21.txt
+ 22
− 2
View file @ 082b0004
...@@ -3,20 +3,40 @@ Sent: Hello from 21, without E2E Encryption ...@@ -3,20 +3,40 @@ Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Received 5 Received 10
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Sent: Hello from 21, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Message received: Hello from 20, without E2E Encryption Message received: Hello from 20, without E2E Encryption
Received 5 Received 10
basice2e/run.sh
+ 7
− 8
View file @ 082b0004
...@@ -23,8 +23,7 @@ fi ...@@ -23,8 +23,7 @@ fi
PERMISSIONING=$1 PERMISSIONING=$1
# todo revert this # todo revert this
DEBUGLEVEL=1 DEBUGLEVEL=${DEBUGLEVEL-0}
#export GRPC_GO_LOG_VERBOSITY_LEVEL=99 #export GRPC_GO_LOG_VERBOSITY_LEVEL=99
#export GRPC_GO_LOG_SEVERITY_LEVEL=info #export GRPC_GO_LOG_SEVERITY_LEVEL=info
...@@ -264,12 +263,12 @@ then ...@@ -264,12 +263,12 @@ then
wait $PIDVAL wait $PIDVAL
wait $PIDVAL2 wait $PIDVAL2
echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)" # todo: remove -v calls below echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)"
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 10 --receiveCount 10 -m \"Hello from 20, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 10 --receiveCount 10 -m \"Hello from 21, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
...@@ -395,12 +394,12 @@ echo "$CLIENTCMD -- $PIDVAL" ...@@ -395,12 +394,12 @@ echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL wait $PIDVAL
wait $PIDVAL2 wait $PIDVAL2
echo "FORCING MESSAGE PICKUP RETRY... " # todo: remove -v calls below echo "FORCING MESSAGE PICKUP RETRY... "
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 5 --receiveCount 5 -m \"Hello from 20, without E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 10 --receiveCount 10 -m \"Hello from 20, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -v 1 -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -m \"Hello from 21, without E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 10 --receiveCount 10 -m \"Hello from 21, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment