From 3e5c2f5a9de5f1521ca601bb80f4fbb501ed7cd2 Mon Sep 17 00:00:00 2001 From: joshemb <josh@elixxir.io> Date: Thu, 16 Feb 2023 10:14:09 -0800 Subject: [PATCH] Remove channels from basic e2e testing --- basice2e/clients.goldoutput/client500.txt | 9 ---- basice2e/clients.goldoutput/client501.txt | 7 --- basice2e/clients.goldoutput/client502.txt | 7 --- basice2e/run.sh | 57 ----------------------- 4 files changed, 80 deletions(-) delete mode 100644 basice2e/clients.goldoutput/client500.txt delete mode 100644 basice2e/clients.goldoutput/client501.txt delete mode 100644 basice2e/clients.goldoutput/client502.txt diff --git a/basice2e/clients.goldoutput/client500.txt b/basice2e/clients.goldoutput/client500.txt deleted file mode 100644 index 0e74267..0000000 --- a/basice2e/clients.goldoutput/client500.txt +++ /dev/null @@ -1,9 +0,0 @@ -New channel generated -Received 0/0 messages -Received 0/0 messages -Received 3/3 messages -Received from ChannelName this message: Hello, channel, this is 500 -Received from ChannelName this message: Hello, channel, this is 501 -Received from ChannelName this message: Hello, channel, this is 502 -Successfully joined channel ChannelName -Successfully left channel ChannelName diff --git a/basice2e/clients.goldoutput/client501.txt b/basice2e/clients.goldoutput/client501.txt deleted file mode 100644 index 5e19513..0000000 --- a/basice2e/clients.goldoutput/client501.txt +++ /dev/null @@ -1,7 +0,0 @@ -Received 0/0 messages -Received 3/3 messages -Received from ChannelName this message: Hello, channel, this is 500 -Received from ChannelName this message: Hello, channel, this is 501 -Received from ChannelName this message: Hello, channel, this is 502 -Successfully joined channel ChannelName -Successfully left channel ChannelName diff --git a/basice2e/clients.goldoutput/client502.txt b/basice2e/clients.goldoutput/client502.txt deleted file mode 100644 index 5e19513..0000000 --- a/basice2e/clients.goldoutput/client502.txt +++ /dev/null @@ -1,7 +0,0 @@ -Received 0/0 messages -Received 3/3 messages -Received from ChannelName this message: Hello, channel, this is 500 -Received from ChannelName this message: Hello, channel, this is 501 -Received from ChannelName this message: Hello, channel, this is 502 -Successfully joined channel ChannelName -Successfully left channel ChannelName diff --git a/basice2e/run.sh b/basice2e/run.sh index fdc7e30..cafac88 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -1243,63 +1243,6 @@ wait $PIDVAL2 wait $PIDVAL1 echo "Non-Ephemeral Test Complete." -############################################################################### -# Test Channels -############################################################################### - -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 --receiveCount 0 --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel500.id --newChannel" -eval $CLIENTCMD > $CLIENTOUT/client500.txt 2>&1 & -PIDVAL=$! -echo "$CLIENTCMD -- $PIDVAL" - -wait $PIDVAL - -# Have client which created channel send message to channel -CLIENTCMD="timeout 300s ../bin/client channels -s blob500 -l $CLIENTOUT/client500.log $CLIENTOPTS --receiveCount 3 --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel500.id --sendToChannel --message \"Hello, channel, this is 500\"" -eval $CLIENTCMD >> $CLIENTOUT/client500.txt 2>&1 & -PIDVAL1=$! -echo "$CLIENTCMD -- $PIDVAL1" - -# 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 --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" - -# 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 --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 $PIDVAL1 -wait $PIDVAL2 -wait $PIDVAL3 - -# All clients will leave the channel -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 --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 --receiveCount 0 --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel502.id --leaveChannel" -eval $CLIENTCMD >> $CLIENTOUT/client502.txt 2>&1 & -PIDVAL3=$! -echo "$CLIENTCMD -- $PIDVAL3" -sleep 20 -wait $PIDVAL3 -wait $PIDVAL2 -wait $PIDVAL1 - ############################################################################### # Test Ephemeral Registration (e2e test without registering with nodes) -- GitLab