Merge branch 'XX-1969/integrateunifiedpolling' into 'release'

Changes to make unified polling work.

Closes XX-1969

See merge request !68

basice2e/permissioning.yaml

@@ -7,6 +7,8 @@ verbose: "true"
 # Path to log file
 logPath: "results/permissioning.log"
 
+batchSize: 4
+
 # The listening port of this server
 port: 18000
 

basice2e/run.sh

@@ -87,8 +87,6 @@ while [ ! -s rid.txt ] && [ $cnt -lt 120 ]; do
     echo -n "."
 done
 
-
-
 runclients() {
     echo "Starting clients..."
 
@@ -230,14 +228,14 @@ diff -ruN clients.goldoutput $CLIENTCLEAN
 cat $CLIENTOUT/* | strings | grep -e "ERROR" -e "FATAL" > results/client-errors || true
 diff -ruN results/client-errors.txt noerrors.txt
 cat $SERVERLOGS/server-*.log | grep "ERROR" | grep -v "context" | grep -v "metrics" | grep -v "database" > results/server-errors.txt || true
-cat $SERVERLOGS/server-*.log | grep "FATAL" | grep -v "context" | grep -v "database" >> results/server-errors.txt || true
+cat $SERVERLOGS/server-*.log | grep "FATAL" | grep -v "context" | grep -v "transport is closing" | grep -v "database" >> results/server-errors.txt || true
 diff -ruN results/server-errors.txt noerrors.txt
 cat $DUMMYOUT | grep "ERROR" | grep -v "context" | grep -v "failed\ to\ read\ certificate" > results/dummy-errors.txt || true
 cat $DUMMYOUT | grep "FATAL" | grep -v "context" >> results/dummy-errors.txt || true
 diff -ruN results/dummy-errors.txt noerrors.txt
 IGNOREMSG="GetRoundBufferInfo: Error received: rpc error: code = Unknown desc = round buffer is empty"
 cat $GATEWAYLOGS/*.log | grep "ERROR" | grep -v "context" | grep -v "certificate" | grep -v "Failed to read key" | grep -v "$IGNOREMSG" > results/gateway-errors.txt || true
-cat $GATEWAYLOGS/*.log | grep "FATAL" | grep -v "context" >> results/gateway-errors.txt || true
+cat $GATEWAYLOGS/*.log | grep "FATAL" | grep -v "context" | grep -v "transport is closing" >> results/gateway-errors.txt || true
 diff -ruN results/gateway-errors.txt noerrors.txt
 
 echo "NO OUTPUT ERRORS, SUCCESS!"