From 7db6babd10d5ccde9d5668439c02e71a6aa90018 Mon Sep 17 00:00:00 2001
From: "Richard T. Carback III" <rick.carback@gmail.com>
Date: Wed, 15 Jun 2022 22:02:43 +0000
Subject: [PATCH] Update golds and modify script
---
basice2e/clients.goldoutput/client111.txt | 4 ++--
basice2e/clients.goldoutput/client120.txt | 1 +
basice2e/clients.goldoutput/client121.txt | 3 +--
basice2e/clients.goldoutput/client13-2.txt | 1 -
basice2e/run.sh | 16 ++++++++--------
5 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/basice2e/clients.goldoutput/client111.txt b/basice2e/clients.goldoutput/client111.txt
index 879608d..65de192 100644
--- a/basice2e/clients.goldoutput/client111.txt
+++ b/basice2e/clients.goldoutput/client111.txt
@@ -1,3 +1,3 @@
-Sent progress callback for "LoremIpsum.txt" {completed: false, sent: 0, arrived: 0, total: 109, err: <nil>}
-Sent progress callback for "LoremIpsum.txt" {completed: true, sent: 0, arrived: 109, total: 109, err: <nil>}
+Sent progress callback for "LoremIpsum.txt" {completed: false, arrived: 0, total: 109, err: <nil>}
+Sent progress callback for "LoremIpsum.txt" {completed: true, arrived: 109, total: 109, err: <nil>}
Completed sending file.
diff --git a/basice2e/clients.goldoutput/client120.txt b/basice2e/clients.goldoutput/client120.txt
index 052956e..f0fe55c 100644
--- a/basice2e/clients.goldoutput/client120.txt
+++ b/basice2e/clients.goldoutput/client120.txt
@@ -1,4 +1,5 @@
+
Message received: Hello from Client120 to myself, without E2E Encryption
Message received: Hello from Client121, with E2E Encryption
Message received: Hello from Client121, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client121.txt b/basice2e/clients.goldoutput/client121.txt
index a20a99f..7cfbcdd 100644
--- a/basice2e/clients.goldoutput/client121.txt
+++ b/basice2e/clients.goldoutput/client121.txt
@@ -1,5 +1,5 @@
Adding
-Adding
+Backup update received.
Backup update received.
Message received: Hello from Client120, with E2E Encryption
Message received: Hello from Client120, with E2E Encryption
@@ -25,4 +25,3 @@ Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
Sent: Hello from Client121, with E2E Encryption after 121 restoring backup
WARNING: unsafe channel creation enabled
-WARNING: unsafe channel creation enabled
diff --git a/basice2e/clients.goldoutput/client13-2.txt b/basice2e/clients.goldoutput/client13-2.txt
index 2dd1c77..e69de29 100644
--- a/basice2e/clients.goldoutput/client13-2.txt
+++ b/basice2e/clients.goldoutput/client13-2.txt
@@ -1 +0,0 @@
-Failed to register user josh13: rpc error: code = Unknown desc = Username "josh13" is already taken. Please try again
diff --git a/basice2e/run.sh b/basice2e/run.sh
index da3f65b..d435728 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -33,8 +33,8 @@ CLIENTCLEAN=results/clients-cleaned
CLIENTOPTS="--password hello --ndf results/ndf.json --verify-sends --sendDelay 100 --waitTimeout 360 --unsafe-channel-creation -v $DEBUGLEVEL"
CLIENTUDOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
CLIENTSINGLEOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
-CLIENTGROUPOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL"
-CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 360 --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"
CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 420 --unsafe-channel-creation -v $DEBUGLEVEL"
CLIENTBACKUPOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL"
@@ -932,7 +932,7 @@ wait $PIDVAL3
echo "Group User IDs: $CLIENT80ID $CLIENT81ID $CLIENT82ID"
echo "b64:$CLIENT81ID" > $CLIENTOUT/groupParticipants
echo "b64:$CLIENT82ID" >> $CLIENTOUT/groupParticipants
-CLIENTCMD="timeout 360s ../bin/client group -s blob80 -l $CLIENTOUT/client80.log $CLIENTGROUPOPTS --create $CLIENTOUT/groupParticipants --message \"80 inviting 81 and 82 to new group\""
+CLIENTCMD="timeout 605s ../bin/client group -s blob80 -l $CLIENTOUT/client80.log $CLIENTGROUPOPTS --create $CLIENTOUT/groupParticipants --message \"80 inviting 81 and 82 to new group\""
eval $CLIENTCMD > $CLIENTOUT/client80.txt 2>&1 || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
@@ -1057,10 +1057,6 @@ wait $PIDVAL1
wait $PIDVAL2
wait $PIDVAL3
-sort -b -o "$CLIENTOUT/client80.txt" "$CLIENTOUT/client80.txt"
-sort -b -o "$CLIENTOUT/client81.txt" "$CLIENTOUT/client81.txt"
-sort -b -o "$CLIENTOUT/client82.txt" "$CLIENTOUT/client82.txt"
-
echo "GROUP CHAT FINISHED!"
@@ -1103,7 +1099,7 @@ CLIENTCMD="timeout 360s ../bin/client fileTransfer -s blob110 -l $CLIENTOUT/clie
eval $CLIENTCMD > $CLIENTOUT/client110.txt 2>&1 || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
-CLIENTCMD="timeout 360s ../bin/client fileTransfer -s blob111 -l $CLIENTOUT/client111.log $CLIENTFILETRANSFEROPTS --sendFile $CLIENTOUT/client110-contact.bin --filePath LoremIpsum.txt --filePreviewString \"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\" --maxThroughput 1000 --retry 0"
+CLIENTCMD="timeout 700s ../bin/client fileTransfer -s blob111 -l $CLIENTOUT/client111.log $CLIENTFILETRANSFEROPTS --sendFile $CLIENTOUT/client110-contact.bin --filePath LoremIpsum.txt --filePreviewString \"Lorem ipsum dolor sit amet, consectetur adipiscing elit.\" --maxThroughput 500 --retry 0"
eval $CLIENTCMD > $CLIENTOUT/client111.txt 2>&1 || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
@@ -1122,6 +1118,10 @@ sed -i.bak 's/ERROR.*Signature/Signature/g' $CLIENTCLEAN/client*.txt
sed -i.bak 's/[Aa]uthenticat.*$//g' $CLIENTCLEAN/client*.txt
rm $CLIENTCLEAN/client*.txt.bak
+# sort -b -o "$CLIENTOUT/client80.txt" "$CLIENTCLEAN/client80.txt"
+# sort -b -o "$CLIENTOUT/client81.txt" "$CLIENTCLEAN/client81.txt"
+# sort -b -o "$CLIENTOUT/client82.txt" "$CLIENTCLEAN/client82.txt"
+
for C in $(ls -1 $CLIENTCLEAN | grep -v client11[01]); do
sort -o tmp $CLIENTCLEAN/$C || true
cp tmp $CLIENTCLEAN/$C
--
GitLab