Skip to content
Snippets Groups Projects
Commit c2d917fc authored by Jonah Husson's avatar Jonah Husson
Browse files

Merge branch 'feature/hotfix/channel-methods' into 'release'

Add broadcast testing

See merge request !27
parents c2374883 65fa37f6
No related branches found
No related tags found
2 merge requests!68Master merge,!27Add broadcast testing
New broadcast channel generated
Asymmetric broadcast message 2/4 received: Hello to asymmetric channel from channel client 123!
Asymmetric broadcast message 4/4 received: Hello to asymmetric channel from channel client 124!
Symmetric broadcast message 1/4 received: Hello to symmetric channel from channel client 124!
Symmetric broadcast message 3/4 received: Hello to symmetric channel from channel client 122!
Sent symmetric broadcast message: Hello to symmetric channel from channel client 122!
Sent asymmetric broadcast message: Hello to asymmetric channel from channel client 123!
Sent symmetric broadcast message: Hello to symmetric channel from channel client 124!Sent asymmetric broadcast message: Hello to asymmetric channel from channel client 124!
......@@ -1061,6 +1061,50 @@ wait $PIDVAL2
echo "FILE TRANSFER FINISHED..."
echo "TESTING BROADCAST CHANNELS..."
# New broadcast channel...
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client130.log -s blob130 --new --name broadcast-test --description \"Integration test channel\" --chanPath results/integration-channel.json --keyPath results/integration-chan-key.pem --receiveCount 0"
eval $CLIENTCMD >> $CLIENTOUT/client130.txt || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
wait $PIDVAL1
# Start client to listen for messages on the channel
CLIENTCMD="timeout 480s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 1800 -l $CLIENTOUT/client131.log -s blob131 --chanPath results/integration-channel.json --receiveCount 4"
eval $CLIENTCMD >> $CLIENTOUT/client131.txt || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
sleep 10
# Send symmetric broadcast to channel
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client132.log -s blob132 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --symmetric \"Hello to symmetric channel from channel client 122!\""
eval $CLIENTCMD >> $CLIENTOUT/client132.txt || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
# Send asymmetric broadcast to channel
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client133.log -s blob133 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 123!\""
eval $CLIENTCMD >> $CLIENTOUT/client133.txt || true &
PIDVAL3=$!
echo "$CLIENTCMD -- $PIDVAL3"
# Send symmetric & asymmetric broadcasts to channel
CLIENTCMD="timeout 240s ../bin/client broadcast --password hello --ndf results/ndf.json --waitTimeout 360 -l $CLIENTOUT/client134.log -s blob134 --chanPath results/integration-channel.json --receiveCount 0 --sendDelay 5000 --keyPath results/integration-chan-key.pem --asymmetric \"Hello to asymmetric channel from channel client 124!\" --symmetric \"Hello to symmetric channel from channel client 124!\""
eval $CLIENTCMD >> $CLIENTOUT/client134.txt || true &
PIDVAL4=$!
echo "$CLIENTCMD -- $PIDVAL4"
wait $PIDVAL2
wait $PIDVAL3
wait $PIDVAL4
wait $PIDVAL1
echo "BROADCAST CHANNELS FINISHED..."
###############################################################################
# Test connections
###############################################################################
......@@ -1176,6 +1220,7 @@ echo "Ephemeral test complete."
echo "AUTHENTICATED CONNECTION TESTS FINISHED"
echo "TESTS EXITED SUCCESSFULLY, CHECKING OUTPUT..."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment