Skip to content
Snippets Groups Projects
Commit fa3c94e9 authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge branch 'release' of gitlab.com:elixxir/integration into feature/dnf/GroupChat

parents 772fef41 9df4a12c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
basice2e/clients.goldoutput/client20.txt
+ 2
− 22
View file @ fa3c94e9
...@@ -3,40 +3,20 @@ Sent: Hello from 20, without E2E Encryption ...@@ -3,40 +3,20 @@ 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 10 Received 5
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 10 Received 5
basice2e/clients.goldoutput/client21.txt
+ 2
− 22
View file @ fa3c94e9
...@@ -3,40 +3,20 @@ Sent: Hello from 21, without E2E Encryption ...@@ -3,40 +3,20 @@ 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 10 Received 5
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 10 Received 5
basice2e/run.sh
+ 6
− 4
View file @ fa3c94e9
...@@ -272,11 +272,12 @@ then ...@@ -272,11 +272,12 @@ then
wait $PIDVAL2 wait $PIDVAL2
echo "FORCING MESSAGE PICKUP RETRY... (NON-E2E, PRECAN)" 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\"" # Higher timeouts for this test to allow message pickup retry to function
CLIENTCMD="timeout 360s ../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 & eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
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\"" CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS --forceMessagePickupRetry --unsafe -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -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"
...@@ -403,11 +404,12 @@ wait $PIDVAL ...@@ -403,11 +404,12 @@ wait $PIDVAL
wait $PIDVAL2 wait $PIDVAL2
echo "FORCING MESSAGE PICKUP RETRY... " 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\"" # Higher timeouts for this test to allow message pickup retry to function
CLIENTCMD="timeout 360s ../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 & eval $CLIENTCMD >> $CLIENTOUT/client20.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
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\"" CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS --forceMessagePickupRetry -l $CLIENTOUT/client21.log -s blob21 --sendid 21 --destid 20 --sendCount 5 --receiveCount 5 -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