Skip to content
Snippets Groups Projects
Commit 6fac2f4e authored by Richard T. Carback III's avatar Richard T. Carback III
Browse files

Modify diff output to be cleaner when running partial tests. Modify REKEY to... 

Modify diff output to be cleaner when running partial tests. Modify REKEY to use a larger timeout and update golds
parent bef133d4
No related branches found
No related tags found
2 merge requests!68Master merge,!11Release
Hide whitespace changes
Inline Side-by-side
basice2e/clients.goldoutput/client100.txt
+ 2
− 0
View file @ 6fac2f4e
...@@ -17,6 +17,8 @@ Message received: Hello from Niamh101, with E2E Encryption ...@@ -17,6 +17,8 @@ Message received: Hello from Niamh101, with E2E Encryption
Message received: Hello from Niamh101, with E2E Encryption Message received: Hello from Niamh101, with E2E Encryption
Message received: Hello from Niamh101, with E2E Encryption Message received: Hello from Niamh101, with E2E Encryption
Message received: Hello from Niamh101, with E2E Encryption Message received: Hello from Niamh101, with E2E Encryption
Message received: Hello from Niamh101, with E2E Encryption
Message received: Hello from Niamh101, with E2E Encryption
Message received: type is KeyExchangeConfirm Message received: type is KeyExchangeConfirm
Message received: type is KeyExchangeTrigger Message received: type is KeyExchangeTrigger
Received 0 Received 0
......
basice2e/clients.goldoutput/client101.txt
+ 4
− 0
View file @ 6fac2f4e
...@@ -36,10 +36,14 @@ Message received: Hello from Jake100, with E2E Encryption ...@@ -36,10 +36,14 @@ Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: Hello from Jake100, with E2E Encryption
Message received: type is KeyExchangeConfirm Message received: type is KeyExchangeConfirm
Message received: type is KeyExchangeTrigger Message received: type is KeyExchangeTrigger
Received 0 Received 0
Received 20 Received 20
Received 20
Sent: Hello from Niamh101, with E2E Encryption Sent: Hello from Niamh101, with E2E Encryption
Sent: Hello from Niamh101, with E2E Encryption Sent: Hello from Niamh101, with E2E Encryption
Sent: Hello from Niamh101, with E2E Encryption Sent: Hello from Niamh101, with E2E Encryption
......
basice2e/run.sh
+ 6
− 6
View file @ 6fac2f4e
...@@ -35,7 +35,7 @@ CLIENTUDOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL" ...@@ -35,7 +35,7 @@ CLIENTUDOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
CLIENTSINGLEOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL" CLIENTSINGLEOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
CLIENTGROUPOPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL" CLIENTGROUPOPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL" CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL"
CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 420 --unsafe-channel-creation -v $DEBUGLEVEL" CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 600 --unsafe-channel-creation -v $DEBUGLEVEL"
CLIENTBACKUPOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL" CLIENTBACKUPOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
mkdir -p $SERVERLOGS mkdir -p $SERVERLOGS
...@@ -530,11 +530,11 @@ wait $PIDVAL2 ...@@ -530,11 +530,11 @@ wait $PIDVAL2
echo "RUNNING REKEY TEST..." echo "RUNNING REKEY TEST..."
# Test destid syntax too, note wait for 11 messages to catch the message from above ^^^ # Test destid syntax too, note wait for 11 messages to catch the message from above ^^^
CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 20 -m \"Hello from Jake100, with E2E Encryption\"" CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 20 -m \"Hello from Jake100, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
CLIENTCMD="timeout 360s ../bin/client $CLIENTOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 20 --receiveCount 20 -m \"Hello from Niamh101, with E2E Encryption\"" CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 20 --receiveCount 20 -m \"Hello from Niamh101, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
...@@ -543,12 +543,12 @@ wait $PIDVAL2 ...@@ -543,12 +543,12 @@ wait $PIDVAL2
# Now we are just going to exhaust all the keys we have and see if we # Now we are just going to exhaust all the keys we have and see if we
# use the unconfirmed channels # use the unconfirmed channels
CLIENTCMD="timeout 420s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 0 -m \"Hello from Jake100, with E2E Encryption\"" CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client100.log -s blob100 --destid b64:$NIAMHID --sendCount 20 --receiveCount 0 -m \"Hello from Jake100, with E2E Encryption\""
eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client100.txt || true &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
# And receive those messages sent to us # And receive those messages sent to us
CLIENTCMD="timeout 420s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 0 --receiveCount 20" CLIENTCMD="timeout 600s ../bin/client $CLIENTREKEYOPTS $REKEYOPTS -l $CLIENTOUT/client101.log -s blob101 --destid b64:$JAKEID --sendCount 0 --receiveCount 20"
eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true & eval $CLIENTCMD >> $CLIENTOUT/client101.txt || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
...@@ -1152,7 +1152,7 @@ fi ...@@ -1152,7 +1152,7 @@ fi
set +x set +x
diff -aruN $GOLDOUTPUT $CLIENTCLEAN diff -aru $GOLDOUTPUT $CLIENTCLEAN
cat $CLIENTOUT/client42.log | grep -a "Could not confirm authentication channel" > results/deleteContact.txt || true cat $CLIENTOUT/client42.log | grep -a "Could not confirm authentication channel" > results/deleteContact.txt || true
echo "CHECKING FOR SUCCESSFUL CONTACT DELETION" echo "CHECKING FOR SUCCESSFUL CONTACT DELETION"
if [ -s results/deleteContact.txt ] if [ -s results/deleteContact.txt ]
......
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