From a484761babd57264d2f6be6753b9cea78f4588bd Mon Sep 17 00:00:00 2001
From: Robert Rosca <robert.rosca@xfel.eu>
Date: Wed, 11 May 2022 16:22:56 +0200
Subject: [PATCH] Specifically check if gpfs offline, add tests
---
tests/test_webservice.py | 4 ++++
webservice/webservice.py | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/test_webservice.py b/tests/test_webservice.py
index 90d6c6eae..ac9a3f07b 100644
--- a/tests/test_webservice.py
+++ b/tests/test_webservice.py
@@ -93,6 +93,10 @@ def test_parse_config():
(True, ("XFEL_GPFS_OFFLINE_RAW_CC",), False),
# RAW -> dcache, only gpfs, should fail
(False, ("XFEL_GPFS_OFFLINE_RAW_CC",), True),
+ # RAW -> dcache, only online gpfs, should fail
+ (False, ("XFEL_GPFS_ONLINE_SASE_X",), True),
+ # RAW -> gpfs, only online gpfs, should fail
+ (True, ("XFEL_GPFS_ONLINE_SASE_X",), True),
]
)
async def test_wait_on_transfer(
diff --git a/webservice/webservice.py b/webservice/webservice.py
index 87dd7a902..d2681ed15 100644
--- a/webservice/webservice.py
+++ b/webservice/webservice.py
@@ -590,7 +590,7 @@ async def wait_on_transfer(
# in python 3.8
gpfs_transfer_done = (
str(run_dir).startswith("/gpfs/exfel/d")
- and any("XFEL_GPFS" in r for r in repositories)
+ and any("XFEL_GPFS_OFFLINE" in r for r in repositories)
)
dcache_transfer_done = (
--
GitLab