File: 0001-Tests-Fix-xcache-test-failure.patch

package info (click to toggle)
xrootd 5.9.0-1
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 25,916 kB
  • sloc: cpp: 244,536; sh: 2,647; python: 1,980; ansic: 1,027; perl: 814; makefile: 277
file content (37 lines) | stat: -rw-r--r-- 1,352 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
From 7b2facf80d1b103c741f2b15b0bf7a3c36b8a142 Mon Sep 17 00:00:00 2001
From: Mattias Ellert <mattias.ellert@physics.uu.se>
Date: Tue, 14 Oct 2025 23:15:55 +0200
Subject: [PATCH] [Tests] Fix xcache test failure

The test checks that the return code is 54 and that the error message
matches "Run: [ERROR] Server responded with an error: [3019]" in case
of a corrupted cached file.

However, occasionally the return code is 50 and the error message is
"Run: [ERROR] Received corrupted data" in this case instead.

This commit modifies the test so that the test succeeds when this
happens.
---
 tests/xcachewithcsi/test.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/xcachewithcsi/test.sh b/tests/xcachewithcsi/test.sh
index 9aa110f30..3e45cde29 100755
--- a/tests/xcachewithcsi/test.sh
+++ b/tests/xcachewithcsi/test.sh
@@ -58,8 +58,10 @@ XRD_CONNECTIONRETRY=0 ${TIMEOUTCMD} 10 ${XRDCP} -f ${HOST_SRV2}//file1 /dev/null
 ret1=$?
 grep -q "Run: \[ERROR\] Server responded with an error: \[3019\]" /tmp/err.txt
 ret2=$?
+grep -q "Run: \[ERROR\] Received corrupted data" /tmp/err.txt
+ret3=$?
 cat /tmp/err.txt
-if [ $ret1 -ne 54 -o $ret2 -ne 0 ]; then
+if [ $ret1 -ne 54 -o $ret2 -ne 0 ] && [ $ret1 -ne 50 -o $ret3 -ne 0 ] ; then
   echo "${host}: did not get the expected error on corrupted file"
   exit 1
 fi
-- 
2.51.0