Merge branch 'develop' into autopep8-patches/credential_fix

ganga-devs · Dec 8, 2023 · 8e03174 · 8e03174
2 parents 0ec67a2 + ff88b43
commit 8e03174
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ganga/GangaCore/GPIDev/Credentials/AfsToken.py b/ganga/GangaCore/GPIDev/Credentials/AfsToken.py
@@ -27,7 +27,7 @@ class AfsTokenInfo(ICredentialInfo):
     should_warn = False
 
     info_pattern = re.compile(
-        r"^User's \(AFS ID \d*\) tokens for (?P<id>\w*@\S*) \[Expires (?P<expires>.*)\]$", re.MULTILINE)
+        r"^User's \(AFS ID \d*\) (rxkad )?tokens for ((?P<id>\w*@)?\S*) \[Expires (?P<expires>.*)\]$", re.MULTILINE)
 
     __slots__ = ('shell', 'cache', 'initial_requirements')
 

diff --git a/ganga/GangaCore/test/Unit/Credentials/TestCredentialInfo.py b/ganga/GangaCore/test/Unit/Credentials/TestCredentialInfo.py
@@ -51,6 +51,7 @@ def _check_call(self, cmd):
 def fake_shell(mocker):
     s = mocker.patch('GangaCore.GPIDev.Credentials.VomsProxy.VomsProxyInfo.shell', FakeShell())
     mocker.patch('GangaCore.GPIDev.Adapters.ICredentialInfo.os.path.exists', return_value=True)
+    mocker.patch('GangaCore.GPIDev.Credentials.AfsToken.AfsTokenInfo.exists', return_value=True)
     mocker.patch('GangaCore.GPIDev.Credentials.CredentialStore.CredentialStore.enable_caching', False)
     yield s