From f2529cd44ae9c9ed3c168176f389c9ce4308bf34 Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Tue, 1 Jun 2021 13:03:00 -0700
Subject: [PATCH] Bump send/receive count to 7
---
basice2e/clients.goldoutput/client20.txt | 16 ++--------------
basice2e/run.sh | 8 ++++----
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/basice2e/clients.goldoutput/client20.txt b/basice2e/clients.goldoutput/client20.txt
index 2b10e40..6d51126 100644
--- a/basice2e/clients.goldoutput/client20.txt
+++ b/basice2e/clients.goldoutput/client20.txt
@@ -5,12 +5,6 @@ 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
@@ -18,7 +12,7 @@ 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 10
+Received 7
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
Sent: Hello from 20, without E2E Encryption
@@ -26,12 +20,6 @@ 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
@@ -39,4 +27,4 @@ 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 10
+Received 7
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 4221c47..0e95dab 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -272,11 +272,11 @@ then
echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)"
# Higher timeouts for this test to allow message pickup retry to function
- CLIENTCMD="timeout 300s ../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\""
+ CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 7 --receiveCount 7 -m \"Hello from 20, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
- CLIENTCMD="timeout 300s ../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\""
+ CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 7 --receiveCount 7 -m \"Hello from 21, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL"
@@ -404,11 +404,11 @@ wait $PIDVAL2
echo "FORCING MESSAGE PICKUP RETRY... "
# Higher timeouts for this test to allow message pickup retry to function
-CLIENTCMD="timeout 300s ../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\""
+CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client20.log -s blob20 --sendid 20 --destid 21 --sendCount 7 --receiveCount 7 -m \"Hello from 20, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
-CLIENTCMD="timeout 300s ../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\""
+CLIENTCMD="timeout 300s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 7 --receiveCount 7 -m \"Hello from 21, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL"
--
GitLab