From 4410e3cf63571957175fa91fc8d176d3e3c330bc Mon Sep 17 00:00:00 2001
From: joshemb <josh@elixxir.io>
Date: Mon, 30 Jan 2023 11:23:25 -0800
Subject: [PATCH] Fix channels testing

---
 basice2e/clients.goldoutput/client500.txt |  7 +++++--
 basice2e/clients.goldoutput/client501.txt |  8 +++++---
 basice2e/clients.goldoutput/client502.txt |  9 +++++----
 basice2e/run.sh                           | 19 +++++++++++--------
 4 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/basice2e/clients.goldoutput/client500.txt b/basice2e/clients.goldoutput/client500.txt
index 2fe1838..ba2e0e5 100644
--- a/basice2e/clients.goldoutput/client500.txt
+++ b/basice2e/clients.goldoutput/client500.txt
@@ -1,5 +1,8 @@
 New channel generated
-Received message (Hello, channel, this is 500) from ChannelName
-Sent message (Hello, channel, this is 500) to channel ChannelName
 Successfully joined channel ChannelName
+Received from ChannelName this message: Hello, channel, this is 50
+Received from ChannelName this message: Hello, channel, this is 50
+Received from ChannelName this message: Hello, channel, this is 50
+Received 3/3 messages
 Successfully left channel ChannelName
+Received 0/0 messages
diff --git a/basice2e/clients.goldoutput/client501.txt b/basice2e/clients.goldoutput/client501.txt
index 1e7d858..285c2d8 100644
--- a/basice2e/clients.goldoutput/client501.txt
+++ b/basice2e/clients.goldoutput/client501.txt
@@ -1,5 +1,7 @@
-Received message (Hello, channel, this is 500) from ChannelName
-Received message (Hello, channel, this is 501) from ChannelName
-Sent message (Hello, channel, this is 501) to channel ChannelName
 Successfully joined channel ChannelName
+Received from ChannelName this message: Hello, channel, this is 50
+Received from ChannelName this message: Hello, channel, this is 50
+Received from ChannelName this message: Hello, channel, this is 50
+Received 3/3 messages
 Successfully left channel ChannelName
+Received 0/0 messages
diff --git a/basice2e/clients.goldoutput/client502.txt b/basice2e/clients.goldoutput/client502.txt
index b13dc22..f8916fd 100644
--- a/basice2e/clients.goldoutput/client502.txt
+++ b/basice2e/clients.goldoutput/client502.txt
@@ -1,6 +1,7 @@
-Received message (Hello, channel, this is 500) from ChannelName
-Received message (Hello, channel, this is 501) from ChannelName
-Received message (Hello, channel, this is 502) from ChannelName
-Sent message (Hello, channel, this is 502) to channel ChannelName
 Successfully joined channel ChannelName
+Received from ChannelName this message: Hello, channel, this is 502
+Received from ChannelName this message: Hello, channel, this is 500
+Received from ChannelName this message: Hello, channel, this is 501
+Received 3/3 messages
 Successfully left channel ChannelName
+Received 0/0 messages
diff --git a/basice2e/run.sh b/basice2e/run.sh
index 820fb76..9a0805c 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -1249,39 +1249,42 @@ echo "Non-Ephemeral Test Complete."
 echo "TESTING CHANNELS..."
 
 # Initialize creator of channel (will use default channel file path in CLI)
-CLIENTCMD="timeout 300s ../bin/client channels -s blob500 $CLIENTOPTS -l $CLIENTOUT/client500.log --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel500.id --newChannel --sendToChannel --message \"Hello, channel, this is 500\""
+CLIENTCMD="timeout 300s ../bin/client channels -s blob500 $CLIENTOPTS -l $CLIENTOUT/client500.log --receiveCount 3 --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel500.id --newChannel --sendToChannel --message \"Hello, channel, this is 500\""
 eval $CLIENTCMD > $CLIENTOUT/client500.txt 2>&1 &
 PIDVAL=$!
 echo "$CLIENTCMD -- $PIDVAL"
-wait $PIDVAL
+
+sleep 5
 
 # Initialize client which will join channel (will use default channel file path in CLI)
-CLIENTCMD="timeout 300s ../bin/client channels -s blob501 -l $CLIENTOUT/client501.log $CLIENTOPTS --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel501.id --joinChannel --sendToChannel --message \"Hello, channel, this is 501\""
+CLIENTCMD="timeout 300s ../bin/client channels -s blob501 -l $CLIENTOUT/client501.log $CLIENTOPTS --receiveCount 3 --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel501.id --joinChannel --sendToChannel --message \"Hello, channel, this is 501\""
 eval $CLIENTCMD > $CLIENTOUT/client501.txt 2>&1 &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
-wait $PIDVAL2
 
 # Initialize another client which will join channel (will use default channel file path in CLI)
-CLIENTCMD="timeout 420s ../bin/client channels -s blob502 -l $CLIENTOUT/client502.log $CLIENTOPTS --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel502.id --joinChannel --sendToChannel --message \"Hello, channel, this is 502\""
+CLIENTCMD="timeout 420s ../bin/client channels -s blob502 -l $CLIENTOUT/client502.log $CLIENTOPTS --receiveCount 3 --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel502.id --joinChannel --sendToChannel --message \"Hello, channel, this is 502\""
 eval $CLIENTCMD > $CLIENTOUT/client502.txt 2>&1 &
 PIDVAL3=$!
 echo "$CLIENTCMD -- $PIDVAL3"
+
+wait $PIDVAL
+wait $PIDVAL2
 wait $PIDVAL3
 
 # All clients will leave the channel
-CLIENTCMD="timeout 300s ../bin/client channels -s blob500 -l $CLIENTOUT/client500.log $CLIENTOPTS --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel500.id --leaveChannel"
+CLIENTCMD="timeout 300s ../bin/client channels -s blob500 -l $CLIENTOUT/client500.log $CLIENTOPTS --receiveCount 0 --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel500.id --leaveChannel"
 eval $CLIENTCMD >> $CLIENTOUT/client500.txt 2>&1 &
 PIDVAL1=$!
 echo "$CLIENTCMD -- $PIDVAL1"
 
-CLIENTCMD="timeout 300s ../bin/client channels -s blob501 -l $CLIENTOUT/client501.log $CLIENTOPTS --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel501.id --leaveChannel"
+CLIENTCMD="timeout 300s ../bin/client channels -s blob501 -l $CLIENTOUT/client501.log $CLIENTOPTS --receiveCount 0 --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel501.id --leaveChannel"
 eval $CLIENTCMD >> $CLIENTOUT/client501.txt 2>&1 &
 PIDVAL2=$!
 echo "$CLIENTCMD -- $PIDVAL2"
 
 # Initialize another client which will join channel (will use default channel file path in CLI)
-CLIENTCMD="timeout 300s ../bin/client channels -s blob502 -l $CLIENTOUT/client502.log $CLIENTOPTS --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel502.id --leaveChannel"
+CLIENTCMD="timeout 300s ../bin/client channels -s blob502 -l $CLIENTOUT/client502.log $CLIENTOPTS --receiveCount 0 --channelPath $CLIENTOUT/channel500.chan  --channelIdentityPath $CLIENTOUT/channel502.id --leaveChannel"
 eval $CLIENTCMD >> $CLIENTOUT/client502.txt 2>&1 &
 PIDVAL3=$!
 echo "$CLIENTCMD -- $PIDVAL3"
-- 
GitLab