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

Merge branch 'feature/hotfix/filteredUpdates' into 'release'

Feature/hotfix/filtered updates

See merge request elixxir/integration!120
parents 9372aff2 f330eef6
No related branches found
No related tags found
1 merge request!4Release
Sent: Hi 19->19, with E2E Encryption
Sent: Hi 19->19, with E2E Encryption
Message received: Hi 19->19, with E2E Encryption
Message received: Hi 19->19, with E2E Encryption
Received 2
...@@ -214,6 +214,7 @@ then ...@@ -214,6 +214,7 @@ then
# Send E2E messages between a single user # Send E2E messages between a single user
mkdir -p blob9 mkdir -p blob9
mkdir -p blob18 mkdir -p blob18
mkdir -p blob91
echo "TEST E2E WITH PRECANNED USERS..." echo "TEST E2E WITH PRECANNED USERS..."
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob9/blob9 --sendid 9 --destid 9 -m \"Hi 9->9, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 & eval $CLIENTCMD >> $CLIENTOUT/client9.txt 2>&1 &
...@@ -225,6 +226,12 @@ then ...@@ -225,6 +226,12 @@ then
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL wait $PIDVAL
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client19.log --sendDelay 1000 --sendCount 2 --receiveCount 2 -s blob19/blob19 --slowPolling --sendid 19 --destid 19 -m \"Hi 19->19, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client19.txt 2>&1 &
PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL"
wait $PIDVAL
# Send E2E messages between two users # Send E2E messages between two users
CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob9/blob9 --sendid 9 --destid 18 -m \"Hi 9->18, with E2E Encryption\"" CLIENTCMD="timeout 240s ../bin/client $CLIENTOPTS -l $CLIENTOUT/client9.log --sendDelay 1000 --sendCount 3 --receiveCount 3 -s blob9/blob9 --sendid 9 --destid 18 -m \"Hi 9->18, with E2E Encryption\""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment