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

Use ephemeral initialization flag for connection tests

parent ce7408d4
No related branches found
No related tags found
2 merge requests!68Master merge,!28Add integration test for connections
Hide whitespace changes
Inline Side-by-side
basice2e/- 0 → 100644
+ 1
− 0
View file @ 4de88e51
<xxc(2)0Tn65dcaNnvkZNbGnn9EhuW3qD0D6sDnGgWGJoqxGtoDrgZ7Ugdw/BAr6cdsGnfdtW48mvt+1hEE+unorwuFjzHdCBpXqddAtM5fPczC3sEP8SNdtVxN3BZ3tTXntFTMgklZPEjIL0P5+GXsyPA2BwAbMHlG6/UQ69kdwC0s/qgz7bAcXxhilk/RnopTVYHAoyqSkm43EpJLbVRX6jg6JyDqg3M8QhEOGKbrBwfxmWFosroBP2gUWJAtR3vDHaVjLku4hbeVPHDIJJlCN94Y0YDjpRTg788ad6B3gSN759gPuvKK1mL+ilB6U7tl/XDvidTCjUUqbEZcLQIthfAHmMjyn6AKFTPPigqCkFHOJyYXvhbvZOri7cag8dSqCvXfvgoOnzXAyLf1Yvy7+5e4bqAwZGY3bGrLxPGTz1yxoKKH3+TRMXdXXGb0tRrnAePXbUwrn1i4lnmiUTdNioP2BswViBZZy246fqJpICWG8oEO6E+SS/qPL9rdux7Dxr88hgwndHoKNEW9Q6lPDx+TqV7/Pq8W6droEOmEhn11KfgWXNlZkBfP7QNMyhPcdfjDFYPA4Dqt5GuC8QAAAgA7f2vtFu2mhRGc1XtaLU/Z0g==xxc>
\ No newline at end of file
basice2e/clients.goldoutput/client201.txt
+ 2
− 0
View file @ 4de88e51
Loading ephemerally
Sending connection request
Established connection with server
Sent message "Hello 200 from 201, using connections" to connection partner.
Loading ephemerally
Sending connection request
Established connection with server
Disconnected from partner
basice2e/clients.goldoutput/client203.txt
+ 2
− 0
View file @ 4de88e51
Loading 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
Established authenticated connection with server.
Disconnected from partner
basice2e/run.sh
+ 64
− 8
View file @ 4de88e51
......@@ -1167,36 +1167,66 @@ echo "FILE TRANSFER FINISHED..."
###############################################################################
echo "TESTING CONNECTIONS..."
echo "Testing Ephemeral Initialization..."
# Initiate server
CLIENTCMD="timeout 240s ../bin/client connection -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 2m"
eval $CLIENTCMD > $CLIENTOUT/client200.txt 2>&1 || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
echo "Sleeping to ensure connection server instantiation"
sleep 5
# Initiate client and send message to server
CLIENTCMD="timeout 240s ../bin/client connection -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 &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2
# Disconnect
CLIENTCMD="timeout 240s ../bin/client connection -s blob201 $CONNECTIONOPTS -l $CLIENTOUT/client201.log --connect $CLIENTOUT/client200-server.bin --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
echo "CONNECTION TESTS FINISHED"
echo "Ephemeral Test Complete."
# TODO: TEST NON-EPHEMERAL CODE-PATH WHEN SUPPORTED
#echo "Testing Non-Ephemeral Initialization..."
## Initiate server
#CLIENTCMD="timeout 240s ../bin/client connection -s blob200 $CONNECTIONOPTS --writeContact $CLIENTOUT/client200-server.bin -l $CLIENTOUT/client200.log --startServer --serverTimeout 2m"
#eval $CLIENTCMD > $CLIENTOUT/client200.txt 2>&1 || true &
#PIDVAL1=$!
#echo "$CLIENTCMD -- $PIDVAL1"
#echo "Sleeping to ensure connection server instantiation"
#sleep 5
## Initiate client and send message to server
#CLIENTCMD="timeout 240s ../bin/client connection -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 &
#PIDVAL2=$!
#echo "$CLIENTCMD -- $PIDVAL2"
#wait $PIDVAL2
#
## Disconnect
#CLIENTCMD="timeout 240s ../bin/client connection -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
#echo "Non-Ephemeral Test Complete."
#
echo "CONNECTION TESTS FINISHED"
###############################################################################
# Test authenticated connections
###############################################################################
echo "TESTING AUTHENTICATED CONNECTIONS..."
echo "Testing Ephemeral Initialization..."
# Initiate server
CLIENTCMD="timeout 240s ../bin/client connection -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 2m"
eval $CLIENTCMD > $CLIENTOUT/client202.txt 2>&1 || true &
PIDVAL1=$!
echo "$CLIENTCMD -- $PIDVAL1"
......@@ -1204,20 +1234,46 @@ echo "Sleeping to ensure connection server instantiation"
sleep 5
# Initiate client and send message to server
CLIENTCMD="timeout 240s ../bin/client connection -s blob203 --authenticated --connect $CLIENTOUT/client202-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client203.log -m \"Hello 202 from 203, using connections\" --receiveCount 0"
CLIENTCMD="timeout 240s ../bin/client connection --ephemeral -s blob203 --authenticated --connect $CLIENTOUT/client202-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client203.log -m \"Hello 202 from 203, using connections\" --receiveCount 0"
eval $CLIENTCMD > $CLIENTOUT/client203.txt 2>&1 || true &
PIDVAL2=$!
echo "$CLIENTCMD -- $PIDVAL2"
wait $PIDVAL2
# Disconnect
CLIENTCMD="timeout 240s ../bin/client connection -s blob203 --authenticated $CONNECTIONOPTS -l $CLIENTOUT/client203.log --connect $CLIENTOUT/client202-server.bin --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
echo "Ephemeral test complete."
# TODO: TEST NON-EPHEMERAL CODE-PATH WHEN SUPPORTED
#echo "Testing Non-Ephemeral Initialization..."
## Initiate server
#CLIENTCMD="timeout 240s ../bin/client connection -s blob202 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client202-server.bin -l $CLIENTOUT/client202.log --startServer --serverTimeout 2m"
#eval $CLIENTCMD > $CLIENTOUT/client202.txt 2>&1 || true &
#PIDVAL1=$!
#echo "$CLIENTCMD -- $PIDVAL1"
#echo "Sleeping to ensure connection server instantiation"
#sleep 5
#
## Initiate client and send message to server
#CLIENTCMD="timeout 240s ../bin/client connection -s blob203 --authenticated --connect $CLIENTOUT/client202-server.bin $CONNECTIONOPTS -l $CLIENTOUT/client203.log -m \"Hello 202 from 203, using connections\" --receiveCount 0"
#eval $CLIENTCMD > $CLIENTOUT/client203.txt 2>&1 || true &
#PIDVAL2=$!
#echo "$CLIENTCMD -- $PIDVAL2"
#wait $PIDVAL2
#
## Disconnect
#CLIENTCMD="timeout 240s ../bin/client connection -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
#echo "Non-Ephemeral Test Complete."
echo "AUTHENTICATED CONNECTION TESTS FINISHED"
......
basice2e/tmp 0 → 100644
+ 8
− 0
View file @ 4de88e51
Disconnected from partner
Established
Established
loading ephemerally
loading ephemerally
Sending connection request
Sending connection request
Sent message "Hello 202 from 203, using connections" to connection partner.
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