From fddeb5774293786a3be41a8a982ccc851d68d355 Mon Sep 17 00:00:00 2001 From: Antonio Linares Date: Thu, 22 Jan 2026 16:25:54 +0100 Subject: [PATCH] improve unit test for TagCollector --- src/python/WMCore/Services/TagCollector/TagCollector.py | 4 ++-- .../WMCore_t/Services_t/TagCollector_t/TagCollector_t.py | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/python/WMCore/Services/TagCollector/TagCollector.py b/src/python/WMCore/Services/TagCollector/TagCollector.py index b20753ddd7..e7ffb53f58 100644 --- a/src/python/WMCore/Services/TagCollector/TagCollector.py +++ b/src/python/WMCore/Services/TagCollector/TagCollector.py @@ -6,7 +6,7 @@ standard_library.install_aliases() import logging -from os import path +import os from urllib.parse import urlparse from collections import defaultdict @@ -143,7 +143,7 @@ def _getResult(self, callname="", clearCache=False, except Exception: logging.error('Something went wrong accessing ReleasesXML from cmssdt, perhaps the service is temporarily down') logging.info('Checking if cvmfs is mounted') - cvmfsMounted = path.ismount('/cvmfs') + cvmfsMounted = os.path.ismount('/cvmfs') if cvmfsMounted: logging.info('cvmfs is mounted. Retrying to access ReleasesXML from cvmfs') try: diff --git a/test/python/WMCore_t/Services_t/TagCollector_t/TagCollector_t.py b/test/python/WMCore_t/Services_t/TagCollector_t/TagCollector_t.py index 281922b650..6cd5dd0c7c 100644 --- a/test/python/WMCore_t/Services_t/TagCollector_t/TagCollector_t.py +++ b/test/python/WMCore_t/Services_t/TagCollector_t/TagCollector_t.py @@ -39,7 +39,6 @@ def _getResult(self, testReleasesMap=None, testReleasesXML=None): except Exception: logging.error('Something went wrong parsing the test releasesMap into the sample XML file') raise - return result def data(self, testReleasesMap=None, testReleasesXML=None): @@ -71,7 +70,7 @@ def releases(self, arch=None, testReleasesMap=None, testReleasesXML=None): arr.append(item['label']) return list(set(arr)) - def architectures(self, arch=None, testReleasesMap=None, testReleasesXML=None): + def architectures(self, testReleasesMap=None, testReleasesXML=None): """ _architectures_ @@ -142,7 +141,6 @@ def testTagCollecorMethods(self): self.assertEqual(len(architecturesCvmfs), len(realsese_by_arch_cvmfs)) self.assertEqual(sorted(self.releases(arch='el8_amd64_gcc12', testReleasesMap=self.testReleasesMap, testReleasesXML=self.testReleasesXML)), sorted(realsese_by_arch_cvmfs.get('el8_amd64_gcc12'))) - return if __name__ == '__main__':