From 082b0004be0f749b45987281034f29031d0e56da Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Wed, 19 May 2021 09:41:40 -0700
Subject: [PATCH] Clean up and add more messages for message retry test

---
 basice2e/clients.goldoutput/client20.txt | 24 ++++++++++++++++++++++--
 basice2e/clients.goldoutput/client21.txt | 24 ++++++++++++++++++++++--
 basice2e/run.sh                          | 15 +++++++--------
 3 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/basice2e/clients.goldoutput/client20.txt b/basice2e/clients.goldoutput/client20.txt
index 9576ea8..2b10e40 100644
--- a/basice2e/clients.goldoutput/client20.txt
+++ b/basice2e/clients.goldoutput/client20.txt
@@ -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
+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
+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
diff --git a/basice2e/clients.goldoutput/client21.txt b/basice2e/clients.goldoutput/client21.txt
index 0ce63ad..12b9325 100644
--- a/basice2e/clients.goldoutput/client21.txt
+++ b/basice2e/clients.goldoutput/client21.txt
@@ -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
+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
+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
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 2fea102..fa727a6 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -23,8 +23,7 @@ fi
 PERMISSIONING=$1
 
 # todo revert this
-DEBUGLEVEL=1
-
+DEBUGLEVEL=${DEBUGLEVEL-0}
 
 #export GRPC_GO_LOG_VERBOSITY_LEVEL=99
 #export GRPC_GO_LOG_SEVERITY_LEVEL=info
@@ -264,12 +263,12 @@ then
     wait $PIDVAL
     wait $PIDVAL2
 
-    echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)" # todo: remove -v calls below
-    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\""
+    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 10 --receiveCount 10 -m \"Hello from 20, without E2E Encryption\""
     eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
     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 &
     PIDVAL2=$!
     echo "$CLIENTCMD -- $PIDVAL"
@@ -395,12 +394,12 @@ echo "$CLIENTCMD -- $PIDVAL"
 wait $PIDVAL
 wait $PIDVAL2
 
-echo "FORCING MESSAGE PICKUP RETRY... " # todo: remove -v calls below
-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\""
+echo "FORCING MESSAGE PICKUP RETRY... "
+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 &
 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 &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL"
-- 
GitLab