From 5a5e6b23a93820e0b1357dd1b245c394f63bbb96 Mon Sep 17 00:00:00 2001 From: "Richard T. Carback III" <rick.carback@gmail.com> Date: Wed, 3 Mar 2021 22:59:08 +0000 Subject: [PATCH] Show differences with binary files and update golds --- basice2e/clients.goldoutput/client100.txt | Bin 2621 -> 2266 bytes basice2e/clients.goldoutput/client101.txt | 2 +- basice2e/clients.goldoutput/client13.txt | 2 +- basice2e/clients.goldoutput/client18.txt | 2 +- basice2e/clients.goldoutput/client31.txt | Bin 888 -> 533 bytes basice2e/clients.goldoutput/client42.txt | Bin 1552 -> 1183 bytes basice2e/clients.goldoutput/client43.txt | 2 +- basice2e/clients.goldoutput/client9.txt | 4 ++-- basice2e/run.sh | 4 ++-- 9 files changed, 8 insertions(+), 8 deletions(-) diff --git a/basice2e/clients.goldoutput/client100.txt b/basice2e/clients.goldoutput/client100.txt index 7a4a28d63cb1c32df7ae60ab9ca67c19e0b2f675..a6c5a07bdfacb1e3ff2919b291da23bd73db3db9 100644 GIT binary patch delta 11 Scmdlha!YVR@8%DTz8nA`Mg-FU literal 2621 zcmWGe%`34|@JP+c$yZ1#%Fk8sO3Y3*G%!#o$ydm&EKbcy(@`kTEXl|(Em3eaa#e86 zOD?J`D9Oyv<MK@{E>28ORVYeLPR%S!O(D~mAgFc)LoP=yM=ooIQ9#2G;KCK*kZ4Aa z<5ATm8KYr>TriBL6U@Sr8eu}E(iE>Tewm568HNUi*xfs-6<P(31`|<L{Ae(Z#9)Fq I*NhCf02RLbJpcdz diff --git a/basice2e/clients.goldoutput/client101.txt b/basice2e/clients.goldoutput/client101.txt index 6b625f5..3f2d5f8 100644 --- a/basice2e/clients.goldoutput/client101.txt +++ b/basice2e/clients.goldoutput/client101.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Received 0 Sent: Hello from Niamh101, with E2E Encryption Sent: Hello from Niamh101, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client13.txt b/basice2e/clients.goldoutput/client13.txt index 3840a3b..1599f88 100644 --- a/basice2e/clients.goldoutput/client13.txt +++ b/basice2e/clients.goldoutput/client13.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Received 0 Received 0 Sent: Hello from Josh13, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt index aaf46d6..36e0ab7 100644 --- a/basice2e/clients.goldoutput/client18.txt +++ b/basice2e/clients.goldoutput/client18.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Sent: Hi 18->9, with E2E Encryption Sent: Hi 18->9, with E2E Encryption Sent: Hi 18->9, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client31.txt b/basice2e/clients.goldoutput/client31.txt index ab1af97de392783107acd7f7f3ba132b6dd107e2..3e36473d5c023f5b1951542248fc255e7aeaf95f 100644 GIT binary patch delta 9 QcmeytHkD;_GNULH01{RL#sB~S literal 888 zcmZ?da^$jR7zH#80j{9b<kZZv)D#5+uHe+X5-SCd)SR4rg|wplTm`TE;tXR$9fk7D xk_-h`BUc62yyT+Ff|AVqydkOBH?_DpF+EkG2<m4H&l(zI_v}c}2u}#6TmZ`BwLbs= diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt index 1e74af66cd5ed71951cd9b6e39301a0a0d15fc60..f3aacc065aa9690908d4ba9c5f8f099884bdeb48 100644 GIT binary patch delta 24 gcmbQhGoN!p_vUwuT#S?Lm=8}r%j&$DhlPa+0CMLD6#xJL literal 1552 zcmWGe%`34|@JP+c$yZ1#%Fk5@%1q8SF;XbWSIDg_PR&WvQ7F$W$;dA)QE)YKRdCHq zE~+dj$;{8=@=Yx+PE1c#C`wIE%`8hzA<vW`sBQ&AE=Mj$E^CHSK*JE=f(N$&7mk>R q#5a0m4@Je)NuYR5aZ1fIF~%NZLq#7vMVOB86fq3qlH4?hlm-AxN0zPt diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt index 7c573d9..91bddd4 100644 --- a/basice2e/clients.goldoutput/client43.txt +++ b/basice2e/clients.goldoutput/client43.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Received 0 Received 0 Sent: Hello from Ben43, with E2E Encryption diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt index 6efc1ff..018fcbb 100644 --- a/basice2e/clients.goldoutput/client9.txt +++ b/basice2e/clients.goldoutput/client9.txt @@ -1,5 +1,5 @@ WARNING: unsafe channel creation enabled -Adding a +Adding Sent: Hi 9->9, with E2E Encryption Sent: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption @@ -11,7 +11,7 @@ Message received: Hi 9->9, with E2E Encryption Message received: Hi 9->9, with E2E Encryption Received 2 WARNING: unsafe channel creation enabled -Adding a +Adding Sent: Hi 9->18, with E2E Encryption Sent: Hi 9->18, with E2E Encryption Sent: Hi 9->18, with E2E Encryption diff --git a/basice2e/run.sh b/basice2e/run.sh index 928105a..80b9966 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -457,7 +457,7 @@ cp $CLIENTOUT/*.txt $CLIENTCLEAN/ sed -i.bak 's/Sending\ to\ .*\:/Sent:/g' $CLIENTCLEAN/client*.txt sed -i.bak 's/Message\ from\ .*, .* Received:/Received:/g' $CLIENTCLEAN/client*.txt sed -i.bak 's/ERROR.*Signature/Signature/g' $CLIENTCLEAN/client*.txt -#sed -i.bak 's/uthenticat.*$//g' $CLIENTCLEAN/client*.txt +sed -i.bak 's/[Aa]uthenticat.*$//g' $CLIENTCLEAN/client*.txt rm $CLIENTCLEAN/client*.txt.bak # for C in $(ls -1 $CLIENTCLEAN); do @@ -470,7 +470,7 @@ set -e echo "TESTS EXITED SUCCESSFULLY, CHECKING OUTPUT..." set +x -diff -ruN clients.goldoutput $CLIENTCLEAN +diff -aruN clients.goldoutput $CLIENTCLEAN if [ "$PERMISSIONING" == "" ] then -- GitLab