From b1c05265f0f1654511135bb2392ef78b9cd108d1 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Thu, 7 Mar 2024 13:48:31 +0100 Subject: just-mr: Add test for "preferred hostnames" --- test/end-to-end/just-mr/TARGETS | 1 + test/end-to-end/just-mr/just-mr-mirrors.test.sh | 106 ++++++++++++++++++++++-- 2 files changed, 100 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS index 1fa1cb13..2b6c9497 100644 --- a/test/end-to-end/just-mr/TARGETS +++ b/test/end-to-end/just-mr/TARGETS @@ -48,6 +48,7 @@ , "deps": [ "create_test_archives" , ["utils", "test_utils_install"] + , ["utils", "null server"] , ["end-to-end", "mr-tool-under-test"] ] } diff --git a/test/end-to-end/just-mr/just-mr-mirrors.test.sh b/test/end-to-end/just-mr/just-mr-mirrors.test.sh index 2e8e7d2e..b037a393 100644 --- a/test/end-to-end/just-mr/just-mr-mirrors.test.sh +++ b/test/end-to-end/just-mr/just-mr-mirrors.test.sh @@ -17,11 +17,14 @@ set -eu # cleanup of http.server; pass server_pid as arg server_cleanup() { - echo "Shut down HTTP server" - # send SIGTERM - kill ${1} & res=$! - wait ${res} - echo "done" + echo "Shut down HTTP server(s)" + while [ -n "${1:-}" ]; do + # send SIGTERM + kill ${1} & res=$! + wait ${res} + echo "done ${1}" + shift + done } readonly ROOT=`pwd` @@ -165,9 +168,11 @@ cat > test-repos.json < just-local.json < test-repos.json < just-local.json <