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

Merge branch 'hotfix/ConnIntegrationFix' into 'release' 

Hotfix/conn integration fix

See merge request !31
parents e22b511f f6693e97
No related branches found
No related tags found
2 merge requests!68Master merge,!31Hotfix/conn integration fix
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 60 deletions
basice2e/clients.goldoutput/client200.txt
+ 1
− 2
View file @ d94351d3
ConnectionServer heard message "Hello 200 from 201, using connections"
Established connection server, begin listening... Established connection server, begin listening...
Established connection with client Established connection with client
Established connection with client ConnectionServer heard message "Hello 200 from 201, using connections"
Shutting down connection server Shutting down connection server
basice2e/clients.goldoutput/client201.txt
+ 0
− 3
View file @ d94351d3
...@@ -2,7 +2,4 @@ Loading ephemerally ...@@ -2,7 +2,4 @@ Loading ephemerally
Sending connection request Sending connection request
Established connection with server Established connection with server
Sent message "Hello 200 from 201, using connections" to connection partner. Sent message "Hello 200 from 201, using connections" to connection partner.
Loading ephemerally
Sending connection request
Established connection with server
Disconnected from partner Disconnected from partner
basice2e/clients.goldoutput/client202.txt
+ 1
− 2
View file @ d94351d3
Established connection server, begin listening... Established connection server, begin listening...
Established authenticated connection with client Established authenticated connection with client
AuthServer heard message "Hello 202 from 203, using connections" AuthServer heard message "Hello 202 from 203, using connections"
Established authenticated connection with client Shutting down connection server
basice2e/clients.goldoutput/client203.txt
+ 0
− 3
View file @ d94351d3
...@@ -2,7 +2,4 @@ Loading ephemerally ...@@ -2,7 +2,4 @@ Loading ephemerally
Sending connection request Sending connection request
Established authenticated connection with server. Established authenticated connection with server.
Sent message "Hello 202 from 203, using connections" to connection partner. Sent message "Hello 202 from 203, using connections" to connection partner.
Loading ephemerally
Sending connection request
Established authenticated connection with server.
Disconnected from partner Disconnected from partner
basice2e/clients.goldoutput/client204.txt
+ 2
− 1
View file @ d94351d3
Established connection server, begin listening... Established connection server, begin listening...
Established connection with client Established connection with client
ConnectionServer heard message "Hello 200 from 201, using connections" ConnectionServer heard message "Hello 204 from 205, using connections"
Shutting down connection server
basice2e/clients.goldoutput/client205.txt
+ 3
− 6
View file @ d94351d3
Loading ephemerally Loading non-ephemerally
Sending connection request Sending connection request
Established connection with server Established connection with server
Sent message "Hello 200 from 201, using connections" to connection partner. Sent message "Hello 204 from 205, using connections" to connection partner.
Loading ephemerally Disconnected from partner
Sending connection request \ No newline at end of file
Established connection with server
Disconnected from partner
basice2e/clients.goldoutput/client206.txt
+ 2
− 3
View file @ d94351d3
Established connection server, begin listening... Established connection server, begin listening...
Established authenticated connection with client Established authenticated connection with client
AuthServer heard message "Hello 202 from 203, using connections" AuthServer heard message "Hello 206 from 207, using connections"
Established authenticated connection with client Shutting down connection server
basice2e/clients.goldoutput/client207.txt
+ 2
− 5
View file @ d94351d3
Loading ephemerally Loading non-ephemerally
Sending connection request
Established authenticated connection with server.
Sent message "Hello 202 from 203, using connections" to connection partner.
Loading ephemerally
Sending connection request Sending connection request
Established authenticated connection with server. Established authenticated connection with server.
Sent message "Hello 206 from 207, using connections" to connection partner.
Disconnected from partner Disconnected from partner
basice2e/run.sh
+ 6
− 35
View file @ d94351d3
...@@ -1109,27 +1109,20 @@ echo "BROADCAST CHANNELS FINISHED..." ...@@ -1109,27 +1109,20 @@ echo "BROADCAST CHANNELS FINISHED..."
echo "TESTING EPEHMERAL CONNECTIONS..." echo "TESTING EPEHMERAL CONNECTIONS..."
# Initiate server # Initiate server
CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob200 $CONNECTIONOPTS --writeContact $CLIENTOUT/client200-server.bin -l $CLIENTOUT/client200.log --startServer --serverTimeout 2m" CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob200 $CONNECTIONOPTS --writeContact $CLIENTOUT/client200-server.bin -l $CLIENTOUT/client200.log --startServer --serverTimeout 1m30s"
eval $CLIENTCMD > $CLIENTOUT/client200.txt 2>&1 || true & eval $CLIENTCMD > $CLIENTOUT/client200.txt 2>&1 || true &
PIDVAL1=$! PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1" echo "$CLIENTCMD -- $PIDVAL1"
echo "Sleeping to ensure connection server instantiation" echo "Sleeping to ensure connection server instantiation"
sleep 5 sleep 5
# Initiate client and send message to server # Initiate client and send message to server
CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob201 --connect $CLIENTOUT/client200-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client201.log -m \"Hello 200 from 201, using connections\" --receiveCount 0" CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob201 --connect $CLIENTOUT/client200-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client201.log -m \"Hello 200 from 201, using connections\" --receiveCount 0"
eval $CLIENTCMD > $CLIENTOUT/client201.txt 2>&1 || true & eval $CLIENTCMD > $CLIENTOUT/client201.txt 2>&1 || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2" echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2 wait $PIDVAL2
# Disconnect
CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob201 $CONNECTIONOPTS -l $CLIENTOUT/client201.log --connect $CLIENTOUT/client200-server.bin --disconnect"
eval $CLIENTCMD >> $CLIENTOUT/client201.txt 2>&1 || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2
wait $PIDVAL1 wait $PIDVAL1
echo "EPHEMERAL CONNECTION TESTS FINISHED" echo "EPHEMERAL CONNECTION TESTS FINISHED"
############################################################################### ###############################################################################
...@@ -1137,7 +1130,7 @@ echo "EPHEMERAL CONNECTION TESTS FINISHED" ...@@ -1137,7 +1130,7 @@ echo "EPHEMERAL CONNECTION TESTS FINISHED"
############################################################################### ###############################################################################
echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..." echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..."
# Initiate server # Initiate server
CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob202 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client202-server.bin -l $CLIENTOUT/client202.log --startServer --serverTimeout 2m" CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob202 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client202-server.bin -l $CLIENTOUT/client202.log --startServer --serverTimeout 1m30s"
eval $CLIENTCMD > $CLIENTOUT/client202.txt 2>&1 || true & eval $CLIENTCMD > $CLIENTOUT/client202.txt 2>&1 || true &
PIDVAL1=$! PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1" echo "$CLIENTCMD -- $PIDVAL1"
...@@ -1150,15 +1143,7 @@ eval $CLIENTCMD > $CLIENTOUT/client203.txt 2>&1 || true & ...@@ -1150,15 +1143,7 @@ eval $CLIENTCMD > $CLIENTOUT/client203.txt 2>&1 || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2" echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2 wait $PIDVAL2
# Disconnect
CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob203 --authenticated $CONNECTIONOPTS -l $CLIENTOUT/client203.log --connect $CLIENTOUT/client202-server.bin --disconnect"
eval $CLIENTCMD >> $CLIENTOUT/client203.txt 2>&1 || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2
wait $PIDVAL1 wait $PIDVAL1
echo "EPHEMERAL AUTHENTICATED CONNECTION TESTS FINISHED" echo "EPHEMERAL AUTHENTICATED CONNECTION TESTS FINISHED"
############################################################################### ###############################################################################
...@@ -1167,32 +1152,25 @@ echo "EPHEMERAL AUTHENTICATED CONNECTION TESTS FINISHED" ...@@ -1167,32 +1152,25 @@ echo "EPHEMERAL AUTHENTICATED CONNECTION TESTS FINISHED"
echo "TESTING NON-EPHEMERAL CONNECTIONS" echo "TESTING NON-EPHEMERAL CONNECTIONS"
# Initiate server # Initiate server
CLIENTCMD="timeout 240s ../bin/client connection -s blob204 $CONNECTIONOPTS --writeContact $CLIENTOUT/client204-server.bin -l $CLIENTOUT/client204.log --startServer --serverTimeout 2m" CLIENTCMD="timeout 240s ../bin/client connection -s blob204 $CONNECTIONOPTS --writeContact $CLIENTOUT/client204-server.bin -l $CLIENTOUT/client204.log --startServer --serverTimeout 1m30s"
eval $CLIENTCMD > $CLIENTOUT/client204.txt 2>&1 || true & eval $CLIENTCMD > $CLIENTOUT/client204.txt 2>&1 || true &
PIDVAL1=$! PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1" echo "$CLIENTCMD -- $PIDVAL1"
echo "Sleeping to ensure connection server instantiation" echo "Sleeping to ensure connection server instantiation"
sleep 5 sleep 5
# Initiate client and send message to server # Initiate client and send message to server
CLIENTCMD="timeout 240s ../bin/client connection -s blob205 --connect $CLIENTOUT/client204-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client205.log -m \"Hello 204 from 205, using connections\" --receiveCount 0" CLIENTCMD="timeout 240s ../bin/client connection -s blob205 --connect $CLIENTOUT/client204-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client205.log -m \"Hello 204 from 205, using connections\" --receiveCount 0"
eval $CLIENTCMD > $CLIENTOUT/client205.txt 2>&1 || true & eval $CLIENTCMD > $CLIENTOUT/client205.txt 2>&1 || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2" echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2 wait $PIDVAL2
# Disconnect
CLIENTCMD="timeout 240s ../bin/client connection -s blob205 $CONNECTIONOPTS -l $CLIENTOUT/client205.log --connect $CLIENTOUT/client204-server.bin --disconnect"
eval $CLIENTCMD >> $CLIENTOUT/client205.txt 2>&1 || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2
wait $PIDVAL1 wait $PIDVAL1
echo "NON-EPHEMERAL CONNECTION TEST FINISHED." echo "NON-EPHEMERAL CONNECTION TEST FINISHED."
echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..." echo "TESTING EPHEMERAL AUTHENTICATED CONNECTIONS..."
# Initiate server # Initiate server
CLIENTCMD="timeout 240s ../bin/client connection -s blob206 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client206-server.bin -l $CLIENTOUT/client206.log --startServer --serverTimeout 2m" CLIENTCMD="timeout 240s ../bin/client connection -s blob206 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client206-server.bin -l $CLIENTOUT/client206.log --startServer --serverTimeout 1m30s"
eval $CLIENTCMD > $CLIENTOUT/client206.txt 2>&1 || true & eval $CLIENTCMD > $CLIENTOUT/client206.txt 2>&1 || true &
PIDVAL1=$! PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1" echo "$CLIENTCMD -- $PIDVAL1"
...@@ -1205,13 +1183,6 @@ eval $CLIENTCMD > $CLIENTOUT/client207.txt 2>&1 || true & ...@@ -1205,13 +1183,6 @@ eval $CLIENTCMD > $CLIENTOUT/client207.txt 2>&1 || true &
PIDVAL2=$! PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2" echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2 wait $PIDVAL2
# Disconnect
CLIENTCMD="timeout 240s ../bin/client connection -s blob207 --authenticated $CONNECTIONOPTS -l $CLIENTOUT/client207.log --connect $CLIENTOUT/client206-server.bin --disconnect"
eval $CLIENTCMD >> $CLIENTOUT/client207.txt 2>&1 || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2
wait $PIDVAL1 wait $PIDVAL1
echo "Non-Ephemeral Test Complete." echo "Non-Ephemeral Test Complete."
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment