diff --git a/basice2e/run.sh b/basice2e/run.sh index 8ec7d6f1d576519f6b5e31cd7bea12fbcf641cad..6a7b93130ea6f33e17397b354e819a30b0dc521d 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -37,7 +37,7 @@ CLIENTGROUPOPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $D CLIENTFILETRANSFEROPTS="--password hello --waitTimeout 600 --ndf results/ndf.json -v $DEBUGLEVEL" CLIENTREKEYOPTS="--password hello --ndf results/ndf.json --verify-sends --waitTimeout 420 --unsafe-channel-creation -v $DEBUGLEVEL" CLIENTBACKUPOPTS="--password hello --ndf results/ndf.json -v $DEBUGLEVEL" -CONNECTIONOPTS="--password hello --waitTimeout 90 --ndf results/ndf.json -v $DEBUGLEVEL" +CONNECTIONOPTS="--password hello --waitTimeout 360 --ndf results/ndf.json -v $DEBUGLEVEL" mkdir -p $SERVERLOGS mkdir -p $GATEWAYLOGS @@ -1109,13 +1109,12 @@ wait $PIDVAL2 echo "FILE TRANSFER FINISHED..." - ############################################################################### # Test connections ############################################################################### echo "TESTING CONNECTIONS..." # Initiate server -CLIENTCMD="timeout 240s ../bin/client connection -s blob200 $CONNECTIONOPTS --writeContact $CLIENTOUT/client200-server.bin -l $CLIENTOUT/client200.log --startServer --serverTimeout 1m15s" +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" @@ -1143,7 +1142,7 @@ echo "CONNECTION TESTS FINISHED" ############################################################################### echo "TESTING AUTHENTICATED CONNECTIONS..." # Initiate server -CLIENTCMD="timeout 240s ../bin/client connection -s blob202 --authenticated $CONNECTIONOPTS --writeContact $CLIENTOUT/client202-server.bin -l $CLIENTOUT/client202.log --startServer --serverTimeout 1m15s" +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"