Skip to content
Snippets Groups Projects
Commit 3e5c2f5a authored by Josh Brooks's avatar Josh Brooks
Browse files

Remove channels from basic e2e testing

parent 333455e3
No related branches found
No related tags found
2 merge requests!68Master merge,!46Xx 4478/templatize
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
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
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
...@@ -1243,63 +1243,6 @@ wait $PIDVAL2 ...@@ -1243,63 +1243,6 @@ wait $PIDVAL2
wait $PIDVAL1 wait $PIDVAL1
echo "Non-Ephemeral Test Complete." 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) # Test Ephemeral Registration (e2e test without registering with nodes)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment