tests: Simplify redirection in tlsproxy_setup().

[tlsproxy/tlsproxy.git] / tests / common.sh

diff --git a/tests/common.sh b/tests/common.sh
index c66fa55216815bb68861a71554db00958bd88a20..37c691beaf71bbb43480940b98dc58c9e17e1875 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -21,7 +21,7 @@ set -e
 
 cleanup() {
     rm -f \
-        tmp \
+        tmp tlsproxy-log \
         certificate-localhost-proxy.pem certificate-localhost-server.pem \
         proxy-ca-key.pem proxy-ca.pem proxy-invalid.pem proxy-key.pem
 }
@@ -34,8 +34,14 @@ abort() {
     stop_servers
     exit 1
 }
+tlsproxy_setup() {
+    "$srcdir/../src/tlsproxy-setup" >/dev/null 2>&1
+}
+tlsproxy_add() {
+    "$srcdir/../src/tlsproxy-add" "$1" "$srcdir/$2" >/dev/null 2>&1
+}
 tlsproxy() {
-    ../src/tlsproxy -d2 "$@" >/dev/null &
+    ../src/tlsproxy -d2 "$@" >tlsproxy-log 2>&1 &
     pid_tlsproxy=$!
 }
 server() {
@@ -46,6 +52,26 @@ client() {
     ./client ./proxy-ca.pem "$@" > tmp 2>&1
 }
 
+wait_for_ports() {
+    while :; do
+        sleep 1
+
+        # Check if each given port can be reached.
+        ready=1
+        for port in "$@"; do
+            printf 'invalid request\r\n\r\n' \
+                | nc localhost "$port" >/dev/null 2>&1 \
+                || ready=
+        done
+
+        if test -n "$ready"; then
+            break
+        fi
+
+        echo "waiting for ports $* ..."
+    done
+}
+
 test_proxy_failure() {
     grep 'proxy failure' tmp >/dev/null \
         || abort 'test_proxy_failure'