test: move start_webserver to test-functions

To allow re-using `start_webserver` in other test cases (for example for
systemd-import), move `start_webserver` to `test-functions` and add
`stop_webserver` for stopping it again.

diff --git a/test/TEST-31-LIVENET/test.sh b/test/TEST-31-LIVENET/test.sh
index 23b91fdcdba8e8a5ab500cde8f21aa84838a9c91..bfa015dad71ce3748b1883d60e4412bfbbd71104 100755 (executable)
--- a/test/TEST-31-LIVENET/test.sh
+++ b/test/TEST-31-LIVENET/test.sh
@@ -19,24 +19,6 @@ test_check() {
     fi
 }
 
-start_webserver() {
-    local pid port
-
-    echo "Starting HTTP server..." >&2
-    python3 -u -m http.server -d "$TESTDIR" 0 > "$TESTDIR/webserver.log" 2>&1 &
-    pid=$!
-    echo "$pid" > "$TESTDIR/webserver.pid"
-
-    while ! grep -q 'Serving HTTP on' "$TESTDIR/webserver.log"; do
-        echo "sleeping..." >&2
-        sleep 0.05
-    done
-
-    port=$(sed -n 's/.*port \([0-9]\+\).*/\1/p' "$TESTDIR/webserver.log")
-    echo "HTTP server running on port $port (pid $pid)" >&2
-    echo "$port"
-}
-
 client_run() {
     local test_name="$1"
     local append="$2"
@@ -70,12 +52,7 @@ test_setup() {
 }
 
 test_cleanup() {
-    if [[ -s "$TESTDIR/webserver.pid" ]]; then
-        pid=$(cat "$TESTDIR/webserver.pid")
-        echo "Stopping HTTP server (pid $pid)..." >&2
-        kill "$pid"
-        rm "$TESTDIR/webserver.pid"
-    fi
+    stop_webserver
 }
 
 # shellcheck disable=SC1090

diff --git a/test/test-functions b/test/test-functions
index affa53a38ea41bcde5fca120fd7a5dc723020a09..b1a5d16d7724c7d50b2d3f7bc8c2c90b8cbff287 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -112,6 +112,35 @@ client_test_end() {
     rm "$TESTDIR/client_test_name.txt"
 }
 
+# Start a HTTP server that serves the content of TESTDIR
+start_webserver() {
+    local pid port
+
+    echo "Starting HTTP server..." >&2
+    python3 -u -m http.server -d "$TESTDIR" 0 > "$TESTDIR/webserver.log" 2>&1 &
+    pid=$!
+    echo "$pid" > "$TESTDIR/webserver.pid"
+
+    while ! grep -q 'Serving HTTP on' "$TESTDIR/webserver.log"; do
+        echo "sleeping..." >&2
+        sleep 0.05
+    done
+
+    port=$(sed -n 's/.*port \([0-9]\+\).*/\1/p' "$TESTDIR/webserver.log")
+    echo "HTTP server running on port $port (pid $pid)" >&2
+    echo "$port"
+}
+
+# Stop HTTP server that was started by start_webserver
+stop_webserver() {
+    if [[ -s "$TESTDIR/webserver.pid" ]]; then
+        pid=$(cat "$TESTDIR/webserver.pid")
+        echo "Stopping HTTP server (pid $pid)..." >&2
+        kill "$pid"
+        rm "$TESTDIR/webserver.pid"
+    fi
+}
+
 # Wait for the server QEMU has been started up.
 # It should print "Serving" in the server.log in that case.
 wait_for_server_startup() {