Merge pull request #2223 from ganga-devs/credential_fix

Update AFS credential

ganga/GangaCore/GPIDev/Credentials/AfsToken.py

@@ -28,7 +28,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')
 
@@ -130,6 +130,21 @@ def expiry_time(self):
 
         return soonest
 
+    def exists(self):
+         # type: () -> bool
+        """
+        Does the credential exist
+        """
+        info = self.info
+        matches = re.finditer(AfsTokenInfo.info_pattern, info)
+        if not matches:
+            return False
+        all_tokens = [_m for _m in matches]
+        if len(all_tokens) > 0:
+            return True
+        else:
+            return False
+
     def default_location(self):
         """
         This returns the default location of a kerberos token on disk as determined from the uid

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