From 1bca5ef096f1416ee89f1e487b83000e17fbc867 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?=
 <manuel.pegourie-gonnard@arm.com>
Date: Mon, 22 Jan 2018 10:22:09 +0100
Subject: [PATCH 1/2] Increase waiting times compat.sh and ssl-opt.sh

- Some of the CI machines don't have lsof installed yet, so rely on an sleeping
an arbitrary number of seconds while the server starts. We're seeing
occasional failures with the current delay because the CI machines are highly
loaded, which seems to indicate the current delay is not quite enough, but
hopefully not to far either, so double it.

- While at it, also double the watchdog delay: while I don't remember seeing
  much failures due to client timeout, this change doesn't impact normal
running time of the script, so better err on the safe side.

These changes don't affect the test and should only affect the false positive
rate coming from the test framework in those scripts.
---
 tests/compat.sh  |  2 +-
 tests/ssl-opt.sh | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/tests/compat.sh b/tests/compat.sh
index d22a28104..17153f139 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -781,7 +781,7 @@ if type lsof >/dev/null 2>/dev/null; then
     }
 else
     wait_server_start() {
-        sleep 1
+        sleep 2
     }
 fi
 
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index b82f18ef5..bd4b6a8a8 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -409,13 +409,22 @@ fi
 # used by watchdog
 MAIN_PID="$$"
 
-# be more patient with valgrind
+# We use somewhat arbitrary delays for tests:
+# - how long do we wait for the server to start (when lsof not available)?
+# - how long do we allow for the client to finish?
+#   (not to check performance, just to avoid waiting indefinitely)
+# Things are slower with valgrind, so give extra time here.
+#
+# Note: without lsof, there is a trade-off between the running time of this
+# script and the risk of spurious errors because we didn't wait long enough.
+# The watchdog delay on the other hand doesn't affect normal running time of
+# the script, only the case where a client or server gets stuck.
 if [ "$MEMCHECK" -gt 0 ]; then
-    START_DELAY=3
-    DOG_DELAY=30
+    START_DELAY=6
+    DOG_DELAY=60
 else
-    START_DELAY=1
-    DOG_DELAY=10
+    START_DELAY=2
+    DOG_DELAY=20
 fi
 
 # Pick a "unique" port in the range 10000-19999.

From 0870c21fdd0a01bdbf1b9fef04e742cdbf322422 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Mon, 8 Jan 2018 12:38:15 +0100
Subject: [PATCH 2/2] wait_server_start: warn if lsof is not available

If lsof is not available, wait_server_start uses a fixed timeout,
which can trigger a race condition if the timeout turns out to be too
short. Emit a warning so that we know this is going on from the test
logs.
---
 tests/compat.sh  | 1 +
 tests/ssl-opt.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/compat.sh b/tests/compat.sh
index 17153f139..dcbe1bf5e 100755
--- a/tests/compat.sh
+++ b/tests/compat.sh
@@ -780,6 +780,7 @@ if type lsof >/dev/null 2>/dev/null; then
         done
     }
 else
+    echo "Warning: lsof not available, wait_server_start = sleep"
     wait_server_start() {
         sleep 2
     }
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index bd4b6a8a8..27f8160b3 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -187,6 +187,7 @@ if type lsof >/dev/null 2>/dev/null; then
         done
     }
 else
+    echo "Warning: lsof not available, wait_server_start = sleep $START_DELAY"
     wait_server_start() {
         sleep "$START_DELAY"
     }