From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 14 Apr 2022 15:36:31 +0000 (+0100)
Subject: Increase server delay for fake server tests
X-Git-Tag: v9.00~41
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=75395497f53a800ed1dbb2ba5efe4386c04fb5ce;p=users%2Fdwmw2%2Fopenconnect.git

Increase server delay for fake server tests

Doesn't look like 1 second is enough of a delay in all cases.
Increase it and hopefully the tests will stop being so flaky.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/tests/auth-multicert b/tests/auth-multicert
index a009957b..005b511a 100755
--- a/tests/auth-multicert
+++ b/tests/auth-multicert
@@ -37,7 +37,7 @@ echo "Testing multiple certificate authentication against fake Cisco server ...
 OCSERV=${srcdir}/fake-cisco-server.py
 launch_simple_sr_server --enable-multicert --cafile $CAFILE $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating using multiple certificate authentication... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --cafile $CAFILE \
diff --git a/tests/f5-auth-and-config b/tests/f5-auth-and-config
index 5a6c4ecc..11a33d58 100755
--- a/tests/f5-auth-and-config
+++ b/tests/f5-auth-and-config
@@ -33,7 +33,7 @@ echo "Testing F5 auth against fake server ..."
 OCSERV=${srcdir}/fake-f5-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating with username/password in the absence of an HTML login form... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=f5 -q $ADDRESS:443/?no_html_login_form=1 -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||
diff --git a/tests/fortinet-auth-and-config b/tests/fortinet-auth-and-config
index f5fc0169..757b0596 100755
--- a/tests/fortinet-auth-and-config
+++ b/tests/fortinet-auth-and-config
@@ -33,7 +33,7 @@ echo "Testing Fortinet auth against fake server ..."
 OCSERV=${srcdir}/fake-fortinet-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating with username/password and DEFAULT realm... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=fortinet -q $ADDRESS:443 -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||
diff --git a/tests/gp-auth-and-config b/tests/gp-auth-and-config
index babc5ae3..c82c25c8 100755
--- a/tests/gp-auth-and-config
+++ b/tests/gp-auth-and-config
@@ -33,7 +33,7 @@ echo "Testing GlobalProtect auth against fake server ..."
 OCSERV=${srcdir}/fake-gp-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY >/dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Authenticating with username/password via portal... "
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=gp -q $ADDRESS:443/portal -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||
diff --git a/tests/juniper-auth b/tests/juniper-auth
index 32367074..2edd6457 100755
--- a/tests/juniper-auth
+++ b/tests/juniper-auth
@@ -34,7 +34,7 @@ echo "Testing Juniper auth against fake server ..."
 OCSERV=${srcdir}/fake-juniper-server.py
 launch_simple_sr_server $ADDRESS 443 $CERT $KEY > /dev/null 2>&1
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "frmLogin with username/password"
 ( echo "test" | LD_PRELOAD=libsocket_wrapper.so $OPENCONNECT --protocol=nc -q $ADDRESS:443 -u test $FINGERPRINT --cookieonly >/dev/null 2>&1) ||
diff --git a/tests/juniper-sso-auth b/tests/juniper-sso-auth
index 795b9824..10eda8ed 100755
--- a/tests/juniper-sso-auth
+++ b/tests/juniper-sso-auth
@@ -33,7 +33,7 @@ echo "Testing Juniper SSO auth against fake server ..."
 
 ${srcdir}/fake-juniper-sso-server.py $ADDRESS 1443 $CERT $KEY >/dev/null 2>&1 &
 PID=$!
-wait_server $PID 1
+wait_server $PID
 
 echo -n "Azure SSO with MFA. "
 (