From bbcb1ce7030575d708700ca205800e847d846402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg@elzevir.fr>
Date: Fri, 13 Jun 2014 18:05:23 +0200
Subject: [PATCH] Revert "Avoid sleep 1 at server start in ssl-opt.sh"

This reverts commit db2a6c1a20085afc5c61a70d6d95e7e3ef7be61a.

Does not seem to work as expected on the buildbots. Reverted while
investigating, since it had no other used than speeding up the test script.
---
 tests/ssl-opt.sh | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 51047129f..f45d94ba0 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -112,28 +112,6 @@ has_mem_err() {
     fi
 }
 
-# wait for server to be ready
-wait_srv_ready() {
-    if is_polar "$SRV_CMD"; then
-        READY_MSG="Waiting for a remote connection"
-    else
-        READY_MSG="ACCEPT"
-    fi
-
-    # If the server isn't ready after 10 secs, something probably went wrong
-    ( sleep 10; echo "SERVERSTART TIMEOUT"; kill $MAIN_PID ) &
-    WATCHDOG_PID=$!
-
-    while ! grep "$READY_MSG" $SRV_OUT >/dev/null; do
-        # don't use sleep, since the whole goal is to avoid wasting time,
-        # and 1 second is usually way more than the server needs to start
-        true
-    done
-
-    kill $WATCHDOG_PID
-    wait $WATCHDOG_PID
-}
-
 # Usage: run_test name srv_cmd cli_cmd cli_exit [option [...]]
 # Options:  -s pattern  pattern that must be present in server output
 #           -c pattern  pattern that must be present in client output
@@ -167,7 +145,7 @@ run_test() {
     echo "$SRV_CMD" > $SRV_OUT
     $SRV_CMD >> $SRV_OUT 2>&1 &
     SRV_PID=$!
-    wait_srv_ready
+    sleep 1
     echo "$CLI_CMD" > $CLI_OUT
     eval "$CLI_CMD" >> $CLI_OUT 2>&1
     CLI_EXIT=$?