Skip test_useless_frontend if local RSE is not found (#1537)

* Skip `test_useless_frontend` if local RSE is not found * Add missing configuration
XENONnT · Jan 23, 2025 · 0bdc729 · 0bdc729
1 parent 8301dea
commit 0bdc729
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/straxen/storage/rucio_local.py b/straxen/storage/rucio_local.py
@@ -27,9 +27,9 @@ class RucioLocalFrontend(strax.StorageFrontend):
     storage_type = strax.StorageType.LOCAL
     local_prefixes = {
         "UC_DALI_USERDISK": "/dali/lgrandi/rucio/",
-        "SDSC_USERDISK": "/expanse/lustre/projects/chi135/shockley/rucio",
+        "SDSC_USERDISK": "/expanse/lustre/projects/chi135/shockley/rucio/",
     }
-    local_rses = {"UC_DALI_USERDISK": r".rcc.", "SDSC_USERDISK": r".sdsc."}
+    local_rses = {"UC_DALI_USERDISK": r"^dali(\w*).rcc.", "SDSC_USERDISK": r".sdsc."}
 
     def __init__(self, path=None, *args, **kwargs):
         kwargs.setdefault("readonly", True)

diff --git a/tests/storage/test_rucio_local.py b/tests/storage/test_rucio_local.py
@@ -1,11 +1,12 @@
+import os
+import re
+import json
+from bson import json_util
+import shutil
 import socket
 import unittest
 import strax
-import os
 import straxen
-import shutil
-import json
-from bson import json_util
 
 
 class TestRucioLocal(unittest.TestCase):
@@ -175,7 +176,10 @@ class DummyLocalRucio(straxen.RucioLocalFrontend):
 
     @unittest.skipIf(not straxen.utilix_is_configured(), "No DB access")
     @unittest.skipIf(
-        socket.getfqdn() in straxen.RucioLocalFrontend.local_rses,
+        any(
+            re.search(socket.getfqdn(), v) is not None
+            for v in straxen.RucioLocalFrontend.local_rses.values()
+        ),
         "Testing useless frontends only works on hosts where it's not supposed to work",
     )
     def test_useless_frontend(self):