diff --git a/basice2e/clients.goldoutput/client500.txt b/basice2e/clients.goldoutput/client500.txt index f5bba4d98d706bbb3091286b15921da28016f12e..0e7426736ddea4656b40010bea8c06c93843d632 100644 --- a/basice2e/clients.goldoutput/client500.txt +++ b/basice2e/clients.goldoutput/client500.txt @@ -1,5 +1,6 @@ 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 diff --git a/basice2e/run.sh b/basice2e/run.sh index 9a0805c4d05aafd6ae875630531915b67e38faec..df1de6c48aa02d7ee67fee0a67b66f9bca758d95 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -1249,12 +1249,18 @@ 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 --receiveCount 3 --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 0 --channelPath $CLIENTOUT/channel500.chan --channelIdentityPath $CLIENTOUT/channel500.id --newChannel" eval $CLIENTCMD > $CLIENTOUT/client500.txt 2>&1 & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" -sleep 5 +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\"" @@ -1268,7 +1274,7 @@ eval $CLIENTCMD > $CLIENTOUT/client502.txt 2>&1 & PIDVAL3=$! echo "$CLIENTCMD -- $PIDVAL3" -wait $PIDVAL +wait $PIDVAL1 wait $PIDVAL2 wait $PIDVAL3