From 594df28e2a52b33dc4d87aedae0a692cb8122dad Mon Sep 17 00:00:00 2001
From: Rick Carback <rick@privategrity.com>
Date: Thu, 22 Aug 2019 20:35:14 +0000
Subject: [PATCH] Update golds and fix run.sh
---
basice2e/clients.goldoutput/client18.txt | 2 +-
basice2e/clients.goldoutput/client45.txt | 1 +
basice2e/clients.goldoutput/client56.txt | 1 +
basice2e/clients.goldoutput/client67.txt | 1 +
basice2e/clients.goldoutput/client74.txt | 1 +
basice2e/clients.goldoutput/client9.txt | 2 +-
basice2e/run.sh | 5 +++--
basice2e/tmp | 2 +-
8 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 7369a5d..6c5b3a1 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,2 +1,2 @@
-Message from 1122492445..., +CrSKtshK1HhaYaw+S8ePLYeVru/E+z/bwVOpfn3noY= Received: Hello, 18, with E2E Encryption
+Received: Hello, 18, with E2E Encryption
Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index 364c8e1..b7b5025 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,2 +1,3 @@
Message from 7, Rick Received: Hello, 4
+Received: Hello, 4
Sending Message to 5, Ben: Hello, 5
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 1384be5..78d8019 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,2 +1,3 @@
Message from 4, Jim Received: Hello, 5
+Received: Hello, 5
Sending Message to 6, Steph: Hello, 6
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 37a4dcd..4139df1 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,2 +1,3 @@
Message from 5, Ben Received: Hello, 6
+Received: Hello, 6
Sending Message to 7, Rick: Hello, 7
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index 05887b8..634534e 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,2 +1,3 @@
Message from 6, Steph Received: Hello, 7
+Received: Hello, 7
Sending Message to 4, Jim: Hello, 4
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 7611f0c..3206400 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,2 +1,2 @@
-Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
+Received: Hello, 9, with E2E Encryption
Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 442987f..7abafdd 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -161,11 +161,12 @@ for C in $(ls -1 $CLIENTOUT); do
cat $CLIENTOUT/$C | grep "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" -e "Sending Message" -e "Message from" > $CLIENTCLEAN/$C || true
# Take the clean lines and add them
cat $CLIENTOUT/$C | grep -v "\[CLIENT\]" | grep -e "Received\:" -e "Sending Message" -e "Message from" >> $CLIENTCLEAN/$C || true
+ cat $CLIENTOUT/$C | grep -v "\[CLIENT\]" | cut -d\ -f5- | grep -e "Received\:" >> $CLIENTCLEAN/$C || true
done
# only expect up to 10c messages from the e2e clients
-head -10 $CLIENTCLEAN/client9_rekey.txt > $CLIENTCLEAN/client9.txt || true
-head -10 $CLIENTCLEAN/client18_rekey.txt > $CLIENTCLEAN/client18.txt || true
+head -10 $CLIENTCLEAN/client9_rekey.txt | grep -v "\.\.\." > $CLIENTCLEAN/client9.txt || true
+head -10 $CLIENTCLEAN/client18_rekey.txt | grep -v "\.\.\." > $CLIENTCLEAN/client18.txt || true
rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
for C in $(ls -1 $CLIENTCLEAN); do
diff --git a/basice2e/tmp b/basice2e/tmp
index 7611f0c..3206400 100644
--- a/basice2e/tmp
+++ b/basice2e/tmp
@@ -1,2 +1,2 @@
-Message from 1370780053..., Hk5XFJO6EF5R98MW7/FTYaC5rHbJ3tRFYZkj4EKd3ro= Received: Hello, 9, with E2E Encryption
+Received: Hello, 9, with E2E Encryption
Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
--
GitLab