Fix macOS test failures and wire dynamic cluster ports to XrdCl tests.

apeters1971 · apeters1971 · commit de0d8dbc7ed3 · 2026-06-25T16:15:34.000+02:00
Load cluster ports from ports.env in TestEnv, re-patch metalinks on each cluster start, and harden TLS/GSI/HTTP harnesses plus a few XrdCl tests for macOS and interrupted runs.

Assisted-by: Cursor:Composer-2.5 CursorAI
diff --git a/tests/XRootD/gsi.sh b/tests/XRootD/gsi.sh
@@ -24,7 +24,7 @@ function setup_gsi() {
 }
 
 function teardown_gsi() {
-	pwd && ls && rm authdb gridmap proxy.{crt,crtp}
+	rm -f authdb gridmap proxy.crt proxy.crtp iproxy.crt rproxy.crt
 }
 
 function test_gsi() {
diff --git a/tests/XRootD/http.sh b/tests/XRootD/http.sh
@@ -472,11 +472,38 @@ function test_http() {
     local payload="$1"
     local status=""
     local rc=0
-    exec 3<>"/dev/tcp/${smugglingHost}/${smugglingPort}"
-    printf '%s' "$payload" >&3
-    IFS= read -r -t 10 status <&3 || rc=$?
-    exec 3<&-
-    status="${status//$'\r'/}"
+
+    # macOS ships bash 3.2 without /dev/tcp; use python3 when available.
+    if command -v python3 >/dev/null 2>&1; then
+      status=$(printf '%s' "$payload" | _SMUGGLING_HOST="$smugglingHost" _SMUGGLING_PORT="$smugglingPort" python3 -c '
+import os, socket, sys
+host = os.environ["_SMUGGLING_HOST"]
+port = int(os.environ["_SMUGGLING_PORT"])
+payload = sys.stdin.buffer.read()
+s = socket.create_connection((host, port), timeout=10)
+s.sendall(payload)
+try:
+    s.shutdown(socket.SHUT_WR)
+except OSError:
+    pass
+buf = b""
+while b"\n" not in buf and len(buf) < 8192:
+    chunk = s.recv(4096)
+    if not chunk:
+        break
+    buf += chunk
+s.close()
+if buf:
+    sys.stdout.write(buf.split(b"\n", 1)[0].decode("latin-1", "replace").rstrip("\r"))
+' ) || rc=$?
+    else
+      exec 3<>"/dev/tcp/${smugglingHost}/${smugglingPort}"
+      printf '%s' "$payload" >&3
+      IFS= read -r -t 10 status <&3 || rc=$?
+      exec 3<&-
+      status="${status//$'\r'/}"
+    fi
+
     if [[ -n "${status}" ]]; then
       printf '%s' "${status}"
     elif (( rc > 128 )); then
diff --git a/tests/XrdCl/CMakeLists.txt b/tests/XrdCl/CMakeLists.txt
@@ -16,6 +16,8 @@ if(NOT ENABLE_SERVER_TESTS)
   return()
 endif()
 
+set(XRDCL_CLUSTER_TEST_ENV "XRDTEST_PORTS_ENV=${CMAKE_BINARY_DIR}/tests/cluster/ports.env")
+
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/tmp")
 
 add_executable(xrdcl-cluster-tests
@@ -34,7 +36,8 @@ target_link_libraries(xrdcl-cluster-tests
   XrdTestUtils GTest::gtest GTest::gtest_main)
 
 gtest_discover_tests(xrdcl-cluster-tests TEST_PREFIX XrdCl::
-  PROPERTIES DEPENDS XRootD_Cluster FIXTURES_REQUIRED XRootD_Cluster DISCOVERY_TIMEOUT 10)
+  PROPERTIES DEPENDS XRootD_Cluster FIXTURES_REQUIRED XRootD_Cluster
+             ENVIRONMENT "${XRDCL_CLUSTER_TEST_ENV}" DISCOVERY_TIMEOUT 10)
 
 # tests to be run in serial, otherwise they are problematic
 set(SERIAL_TESTS_FILES
@@ -54,5 +57,6 @@ foreach(i ${SERIAL_TESTS_FILES})
     XrdTestUtils GTest::gtest GTest::gtest_main)
 
   gtest_discover_tests(${i}-tests TEST_PREFIX XrdCl::
-    PROPERTIES DEPENDS XRootD_Cluster FIXTURES_REQUIRED XRootD_Cluster RUN_SERIAL 1 DISCOVERY_TIMEOUT 10)
+    PROPERTIES DEPENDS XRootD_Cluster FIXTURES_REQUIRED XRootD_Cluster RUN_SERIAL 1
+               ENVIRONMENT "${XRDCL_CLUSTER_TEST_ENV}" DISCOVERY_TIMEOUT 10)
 endforeach()
diff --git a/tests/XrdCl/XrdClFileCopyTest.cc b/tests/XrdCl/XrdClFileCopyTest.cc
@@ -355,6 +355,11 @@ void FileCopyTest::CopyTestFunc( bool thirdParty )
   PropertyList properties, results;
   FileSystem fs( manager2 );
 
+  // Remove any leftover targets from a previous interrupted run.
+  fs.Rm( targetPath );
+  remove( localFile.c_str() );
+  sync();
+
   //----------------------------------------------------------------------------
   // Copy from a ZIP archive
   //----------------------------------------------------------------------------
@@ -530,6 +535,7 @@ void FileCopyTest::CopyTestFunc( bool thirdParty )
   //----------------------------------------------------------------------------
   // Copy to local fs
   //----------------------------------------------------------------------------
+  remove( localFile.c_str() );
   results.Clear();
   properties.Set( "source", sourceURL );
   properties.Set( "target", "file://localhost" + localFile );
diff --git a/tests/XrdCl/XrdClLocalFileHandlerTest.cc b/tests/XrdCl/XrdClLocalFileHandlerTest.cc
@@ -21,6 +21,7 @@
 #include "XrdSys/XrdSysPlatform.hh"
 
 #include <climits>
+#include <algorithm>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -533,6 +534,14 @@ TEST_F(LocalFileHandlerTest, XAttrTest)
   //----------------------------------------------------------------------------
   resp.clear();
   EXPECT_XRDST_OK( f.ListXAttr( resp ) );
+#ifdef __APPLE__
+  // macOS may attach system xattrs such as com.apple.provenance.
+  resp.erase( std::remove_if( resp.begin(), resp.end(),
+                              []( const XAttr &a ) {
+                                return a.name.compare( 0, 10, "com.apple." ) == 0;
+                              } ),
+              resp.end() );
+#endif
   EXPECT_EQ( resp.size(), 2u );
   vid = resp[0].name == "version" ? 0 : 1;
   int cid = vid == 0 ? 1 : 0;
diff --git a/tests/cluster/CMakeLists.txt b/tests/cluster/CMakeLists.txt
@@ -18,7 +18,8 @@ file(COPY mvdata DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 
 add_test(NAME XRootD::cluster::start
   COMMAND sh -c "cp -r ${CMAKE_CURRENT_SOURCE_DIR}/mvdata ${CMAKE_CURRENT_BINARY_DIR} \
-    && ${CMAKE_CURRENT_SOURCE_DIR}/setup.sh start")
+    && ${CMAKE_CURRENT_SOURCE_DIR}/setup.sh start \
+    || (${CMAKE_CURRENT_SOURCE_DIR}/setup.sh stop; exit 1)")
 set_tests_properties(XRootD::cluster::start
   PROPERTIES ENVIRONMENT "${XRDENV}" FIXTURES_SETUP XRootD_Cluster)
 
diff --git a/tests/cluster/setup.sh b/tests/cluster/setup.sh
@@ -77,6 +77,15 @@ HOST_SRV1=root://localhost:${XRD_PORT_SRV1}
 HOST_SRV2=root://localhost:${XRD_PORT_SRV2}
 HOST_SRV3=root://localhost:${XRD_PORT_SRV3}
 HOST_SRV4=root://localhost:${XRD_PORT_SRV4}
+XRDTEST_MAINSERVERURL=localhost:${XRD_PORT_METAMAN}
+XRDTEST_MANAGER1URL=localhost:${XRD_PORT_MAN1}
+XRDTEST_MANAGER2URL=localhost:${XRD_PORT_MAN2}
+XRDTEST_SERVER1URL=localhost:${XRD_PORT_SRV1}
+XRDTEST_SERVER2URL=localhost:${XRD_PORT_SRV2}
+XRDTEST_SERVER3URL=localhost:${XRD_PORT_SRV3}
+XRDTEST_SERVER4URL=localhost:${XRD_PORT_SRV4}
+XRDTEST_DISKSERVERURL=localhost:${XRD_PORT_METAMAN}
+XRDTEST_LOCALDATAPATH=$(cd "${DATAFOLDER}" && pwd)
 EOF
 }
 
@@ -118,10 +127,23 @@ patch_metalink_ports() {
                      -e "s/localhost:10944/localhost:${XRD_PORT_SRV2}/g" \
                      -e "s/localhost:10945/localhost:${XRD_PORT_SRV3}/g" \
                      -e "s/localhost:10946/localhost:${XRD_PORT_SRV4}/g" \
+                     -e "s/localhost:${PREV_XRD_PORT_SRV1}/localhost:${XRD_PORT_SRV1}/g" \
+                     -e "s/localhost:${PREV_XRD_PORT_SRV2}/localhost:${XRD_PORT_SRV2}/g" \
+                     -e "s/localhost:${PREV_XRD_PORT_SRV3}/localhost:${XRD_PORT_SRV3}/g" \
+                     -e "s/localhost:${PREV_XRD_PORT_SRV4}/localhost:${XRD_PORT_SRV4}/g" \
                      "${file}"
        done
 }
 
+patch_all_metalink_ports() {
+       local dir
+
+       for dir in "${DATAFOLDER}"/*/data/metalink; do
+              [[ -d "${dir}" ]] || continue
+              patch_metalink_ports "${dir}"/*
+       done
+}
+
 filenames=("1db882c8-8cd6-4df1-941f-ce669bad3458.dat"
        "3c9a9dd8-bc75-422c-b12c-f00604486cc1.dat"
        "7235b5d1-cede-4700-a8f9-596506b4cc38.dat"
@@ -213,7 +235,6 @@ generate(){
                      mkdir -p ${DATAFOLDER}/${i}/data/metalink
                      cp ${PREDEF}/input*.meta* ${DATAFOLDER}/${i}/data/metalink/
                      cp ${PREDEF}/ml*.meta*    ${DATAFOLDER}/${i}/data/metalink/
-                     patch_metalink_ports ${DATAFOLDER}/${i}/data/metalink/*
               fi
 
               # download the test files for 'srv2' and add another instance on 1099
@@ -249,12 +270,73 @@ generate(){
        rm -rf ${TMPDATAFOLDER}
 }
 
+kill_pidfile() {
+       local pidfile=$1
+       local pid wait_count
+
+       [[ -s "${pidfile}" ]] || return 0
+       pid=$(ps -o pid= "$(cat "${pidfile}")" 2>/dev/null | tr -d ' ')
+       [[ -n "${pid}" ]] || return 0
+       kill -s TERM "${pid}" 2>/dev/null || true
+       for ((wait_count = 0; wait_count < 50; wait_count++)); do
+              ps -p "${pid}" >/dev/null 2>&1 || return 0
+              sleep 0.1
+       done
+       kill -s KILL "${pid}" 2>/dev/null || true
+}
+
+stop() {
+       local i
+
+       set +e
+       for i in "${servernames[@]}"; do
+              [[ -d "${i}" ]] || continue
+              kill_pidfile "${i}/cmsd.pid"
+              kill_pidfile "${i}/xrootd.pid"
+              rm -rf "${i}"
+       done
+       rm -f "${PORTS_ENV}"
+       set -e
+}
+
 start(){
+       PREV_XRD_PORT_SRV1=10943
+       PREV_XRD_PORT_SRV2=10944
+       PREV_XRD_PORT_SRV3=10945
+       PREV_XRD_PORT_SRV4=10946
+       if [[ -f "${PORTS_ENV}" ]]; then
+              # shellcheck disable=SC1091
+              source "${PORTS_ENV}"
+              PREV_XRD_PORT_SRV1=${XRD_PORT_SRV1}
+              PREV_XRD_PORT_SRV2=${XRD_PORT_SRV2}
+              PREV_XRD_PORT_SRV3=${XRD_PORT_SRV3}
+              PREV_XRD_PORT_SRV4=${XRD_PORT_SRV4}
+       fi
+
+       stop
+
        allocate_ports
        write_configs
        write_ports_env
        generate
+       patch_all_metalink_ports
+
+       local need_cleanup=0
+       start_interrupt_cleanup() {
+              need_cleanup=1
+       }
+       start_exit_cleanup() {
+              if [[ ${need_cleanup} -eq 1 ]]; then
+                     stop
+              fi
+       }
+
+       trap start_interrupt_cleanup INT TERM HUP
+       trap start_exit_cleanup EXIT
+
        set -x
+       need_cleanup=1
+
        # start for each component
        for i in "${servernames[@]}"; do
               ${XROOTD} -b -k fifo -n ${i} -l xrootd.log -s xrootd.pid -c ${i}.cfg
@@ -266,17 +348,8 @@ start(){
        done
 
        sleep 1
-}
-
-stop() {
-	for i in "${servernames[@]}"; do
-		if [[ -d "${i}" ]]; then
-			kill -s TERM $(cat ${i}/cmsd.pid)
-			kill -s TERM $(cat ${i}/xrootd.pid)
-			rm -rf "${i}"
-		fi
-	done
-	rm -f "${PORTS_ENV}"
+       need_cleanup=0
+       trap - EXIT INT TERM HUP
 }
 
 insertFileInfo() {
diff --git a/tests/cluster/test.sh b/tests/cluster/test.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+SETUP_SH="$(cd "$(dirname "$0")" && pwd)/setup.sh"
+
 : ${ADLER32:=$(command -v xrdadler32)}
 : ${CRC32C:=$(command -v xrdcrc32c)}
 : ${XRDCP:=$(command -v xrdcp)}
@@ -60,8 +62,37 @@ done
 # This script assumes that ${host} exports an empty / as read/write.
 # It also assumes that any authentication required is already setup.
 
+RMTDATADIR="/srvdata"
+LCLDATADIR="${PWD}/localdata"  # client folder
+
+cleanup_local_files() {
+       local i
+       for ((i = 0; i < ${#host_names[@]}; i++)); do
+              rm -rf ${LCLDATADIR}/${host_names[i]}.dat
+              rm -rf ${LCLDATADIR}/${host_names[i]}.ref
+       done
+}
+
+stop_cluster() {
+       [[ -x "${SETUP_SH}" ]] && "${SETUP_SH}" stop || true
+}
+
+fixture_cleanup() {
+       local rc=$?
+
+       cleanup_local_files
+       if [[ ${rc} -ne 0 ]]; then
+              echo 1>&2 "Stopping cluster after test failure or interruption."
+              stop_cluster
+       fi
+       return ${rc}
+}
+
 set -e
 
+trap fixture_cleanup EXIT
+trap 'stop_cluster; exit 130' INT TERM HUP
+
 ${XRDCP} --version
 
 for ((i = 0; i < ${#host_names[@]}; i++)); do
@@ -83,9 +114,6 @@ ${XRDFS} ${HOST_METAMAN} stat /
 ${XRDFS} ${HOST_METAMAN} statvfs /
 ${XRDFS} ${HOST_METAMAN} spaceinfo /
 
-RMTDATADIR="/srvdata"
-LCLDATADIR="${PWD}/localdata"  # client folder
-
 mkdir -p ${LCLDATADIR}
 
 assert_xrdmapc_json() {
@@ -104,16 +132,6 @@ assert_xrdmapc_json() {
 
 }
 
-cleanup() {
-       echo "Error occurred. Cleaning up..."
-       local i
-       for ((i = 0; i < ${#host_names[@]}; i++)); do
-              rm -rf ${LCLDATADIR}/${host_names[i]}.dat
-              rm -rf ${LCLDATADIR}/${host_names[i]}.ref
-       done
-}
-trap "cleanup; exit 1" ABRT
-
 assert_xrdmapc_json
 
 # create local files with random contents using OpenSSL
diff --git a/tests/common/CMakeLists.txt b/tests/common/CMakeLists.txt
@@ -5,5 +5,9 @@ add_library(XrdTestUtils SHARED
 
 target_link_libraries(XrdTestUtils ZLIB::ZLIB XrdCl XrdUtils)
 
+target_compile_definitions(XrdTestUtils PRIVATE
+  XRDTEST_DEFAULT_PORTS_ENV="${CMAKE_BINARY_DIR}/tests/cluster/ports.env"
+  XRDTEST_DEFAULT_LOCAL_DATA_PATH="${CMAKE_BINARY_DIR}/tests/cluster/data")
+
 target_include_directories(XrdTestUtils
   PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
diff --git a/tests/common/TestEnv.cc b/tests/common/TestEnv.cc
diff --git a/tests/tls/tls.sh b/tests/tls/tls.sh

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ function setup_gsi() {`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`function teardown_gsi() {`
`27`		`- pwd && ls && rm authdb gridmap proxy.{crt,crtp}`
	`27`	`+ rm -f authdb gridmap proxy.crt proxy.crtp iproxy.crt rproxy.crt`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`function test_gsi() {`