From 453d474b42747acfbbe8f2e2d9233feb92c255e6 Mon Sep 17 00:00:00 2001
From: Julien Leduc <julien.leduc@cern.ch>
Date: Fri, 28 Jun 2019 10:43:01 +0200
Subject: [PATCH] Fix the broken basic test that always timedout because
testFile existed
---
.../docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
index 7c745176c8..472d0e9bc2 100755
--- a/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
+++ b/continuousintegration/docker/ctafrontend/cc7/opt/run/bin/ctaeos-mgm.sh
@@ -208,7 +208,11 @@ fi
echo "Waiting for the basic file transfer test to succeed (workaround for the booted/online issue )"
for ((i=0; i<300; i++)); do
- xrdcp /etc/group root://${eoshost}:/${EOS_TMP_DIR}/testFile && break
+ # xrdcp --force to overwrite testFile if it was already created in the previous loop
+ # but xrdcp failed for another reason
+ xrdcp --force /etc/group root://${eoshost}:/${EOS_TMP_DIR}/testFile && break
+ # If the file exists the loop exited on a successfull xrdcp, otherwise it exited upon timeout and all xrdcp failed
+ eos rm ${EOS_TMP_DIR}/testFile
echo -n "."
sleep 1
done
--
GitLab