From 1744ea7caf013ee95b8c3269b6c594248da9b46d Mon Sep 17 00:00:00 2001
From: josh <josh@elixxir.io>
Date: Tue, 1 Jun 2021 10:26:47 -0700
Subject: [PATCH] Add comment again, resolve conflict
---
basice2e/run.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/basice2e/run.sh b/basice2e/run.sh
index e638f45..4221c47 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -271,6 +271,7 @@ then
wait $PIDVAL2
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\""
eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
PIDVAL=$!
@@ -403,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 8 --receiveCount 8 -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 10 --receiveCount 10 -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 8 --receiveCount 8 -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 10 --receiveCount 10 -m \"Hello from 21, without E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client21.txt || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL"
--
GitLab