rcsb.exdb 1.31__py3-none-any.whl → 1.33__py3-none-any.whl

rcsb/exdb/tree/TreeNodeListWorker.py

@@ -12,6 +12,8 @@
 # 23-Jan-2025 dwp Change indexed field from 'update_id' to 'id'
 #  7-Aug-2025 dwp Change target DB and collection names to "dw" and "tree_*" (via configuration file);
 #                 Make use of configuration file for loading tree node lists and setting indexed fields
+#  6-Jan-2026 dwp Raise error if a tree node list is empty or fails to load;
+#                 Add support for providing a manual list of tree node lists to load (for testing)
 #
 ##
 __docformat__ = "google en"
@@ -41,7 +43,20 @@ logger = logging.getLogger(__name__)
 class TreeNodeListWorker(object):
     """Prepare and load repository holdings and repository update data."""
 
-    def __init__(self, cfgOb, cachePath, numProc=1, chunkSize=10, maxStepLength=4000, readBackCheck=False, documentLimit=None, verbose=False, useCache=False, useFilteredLists=False):
+    def __init__(
+            self,
+            cfgOb,
+            cachePath,
+            numProc=1,
+            chunkSize=10,
+            maxStepLength=4000,
+            readBackCheck=False,
+            documentLimit=None,
+            verbose=False,
+            useCache=False,
+            useFilteredLists=False,
+            treeCollectionList=None,
+    ):
         self.__cfgOb = cfgOb
         self.__cachePath = os.path.abspath(cachePath)
         self.__readBackCheck = readBackCheck
@@ -55,6 +70,7 @@ class TreeNodeListWorker(object):
         self.__statusList = []
         self.__useCache = useCache
         self.__useFilteredLists = useFilteredLists
+        self.__treeCollectionList = treeCollectionList if treeCollectionList else []  # Manually specify tree collections to load
 
     def __updateStatus(self, updateId, databaseName, collectionName, status, startTimestamp):
         try:
@@ -95,43 +111,49 @@ class TreeNodeListWorker(object):
                 ATTRIBUTE_NAMES:
                     - parents
         """
-        try:
-            useCache = self.__useCache
-            #
-            logger.info("Starting with cache path %r (useCache=%r)", self.__cachePath, useCache)
-            #
-            self.__statusList = []
-            desp = DataExchangeStatus()
-            statusStartTimestamp = desp.setStartTime()
-            dl = DocumentLoader(
-                self.__cfgOb,
-                self.__cachePath,
-                self.__resourceName,
-                numProc=self.__numProc,
-                chunkSize=self.__chunkSize,
-                maxStepLength=self.__maxStepLength,
-                documentLimit=self.__documentLimit,
-                verbose=self.__verbose,
-                readBackCheck=self.__readBackCheck,
-            )
-            #
-            sectionName = "tree_node_lists_configuration"
-            databaseNameMongo = self.__cfgOb.get("DATABASE_NAME", sectionName=sectionName)
-            collectionNameList = self.__cfgOb.get("COLLECTION_NAME_LIST", sectionName=sectionName)
-            collectionIndexList = self.__cfgOb.get("COLLECTION_INDICES", sectionName=sectionName)
-            # databaseNameMongo = 'dw'
-            # collectionNameList = ['tree_taxonomy', 'tree_ec', 'tree_scop', 'tree_scop2', 'tree_cath', 'tree_atc', 'tree_card', 'tree_ecod', 'tree_go']
-            # collectionIndexList = [{'INDEX_NAME': 'primary', 'ATTRIBUTE_NAMES': ['id']}, {'INDEX_NAME': 'index_2', 'ATTRIBUTE_NAMES': ['parents']}]
-
-            # collectionVersion = self.__cfgOb.get("COLLECTION_VERSION_STRING", sectionName=sectionName)
-            # addValues = {"_schema_version": collectionVersion}
-            addValues = None
-
-            ok = True
-            for collectionName in collectionNameList:
-                nL = self.__getTreeDocList(collectionName, useCache)
-                if nL and doLoad:
-                    ok = dl.load(
+        ok = True
+        useCache = self.__useCache
+        #
+        logger.info("Starting with cache path %r (useCache=%r)", self.__cachePath, useCache)
+        #
+        self.__statusList = []
+        desp = DataExchangeStatus()
+        statusStartTimestamp = desp.setStartTime()
+        dl = DocumentLoader(
+            self.__cfgOb,
+            self.__cachePath,
+            self.__resourceName,
+            numProc=self.__numProc,
+            chunkSize=self.__chunkSize,
+            maxStepLength=self.__maxStepLength,
+            documentLimit=self.__documentLimit,
+            verbose=self.__verbose,
+            readBackCheck=self.__readBackCheck,
+        )
+        #
+        sectionName = "tree_node_lists_configuration"
+        databaseNameMongo = self.__cfgOb.get("DATABASE_NAME", sectionName=sectionName)
+        collectionNameList = self.__cfgOb.get("COLLECTION_NAME_LIST", sectionName=sectionName)
+        collectionIndexList = self.__cfgOb.get("COLLECTION_INDICES", sectionName=sectionName)
+        # databaseNameMongo = 'dw'
+        # collectionNameList = ['tree_taxonomy', 'tree_ec', 'tree_scop', 'tree_scop2', 'tree_cath', 'tree_atc', 'tree_card', 'tree_ecod', 'tree_go']
+        # collectionIndexList = [{'INDEX_NAME': 'primary', 'ATTRIBUTE_NAMES': ['id']}, {'INDEX_NAME': 'index_2', 'ATTRIBUTE_NAMES': ['parents']}]
+
+        if len(self.__treeCollectionList) > 0:
+            collectionNameList = [col for col in self.__treeCollectionList]
+
+        # collectionVersion = self.__cfgOb.get("COLLECTION_VERSION_STRING", sectionName=sectionName)
+        # addValues = {"_schema_version": collectionVersion}
+        addValues = None
+
+        for collectionName in collectionNameList:
+            nL = self.__getTreeDocList(collectionName, useCache)
+            if doLoad:
+                if not nL or len(nL) == 0:
+                    logger.error("Empty node list returned for collectionName %r", collectionName)
+                    ok = False
+                else:
+                    okL = dl.load(
                         databaseNameMongo,
                         collectionName,
                         loadType=loadType,
@@ -140,18 +162,19 @@ class TreeNodeListWorker(object):
                         addValues=addValues,
                         schemaLevel=None,
                         indexDL=collectionIndexList
-                    ) and ok
+                    )
+                    ok = okL and ok
                     self.__updateStatus(updateId, databaseNameMongo, collectionName, ok, statusStartTimestamp)
-                logger.info(
-                    "Completed load of tree node list for database %r, collection %r, len(nL) %r (status %r)",
-                    databaseNameMongo, collectionName, len(nL), ok
-                )
-            # ---
-            logger.info("Completed tree node list loading operations with loadType %r (status %r)", loadType, ok)
-            return True
-        except Exception as e:
-            logger.exception("Failing with %s", str(e))
-        return False
+
+                    logger.info(
+                        "Completed load of tree node list for database %r, collection %r, len(nL) %r (status %r)",
+                        databaseNameMongo, collectionName, len(nL), okL
+                    )
+        # ---
+        logger.info("Completed tree node list loading operations with loadType %r (status %r)", loadType, ok)
+        if not ok:
+            raise ValueError("Failed to load at least one tree node list.")
+        return ok
 
     def __checkTaxonNodeList(self, nL):
         eCount = 0

{rcsb_exdb-1.31.dist-info → rcsb_exdb-1.33.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rcsb.exdb
-Version: 1.31
+Version: 1.33
 Summary: RCSB Python ExDB data extraction and loading workflows
 Project-URL: Homepage, https://github.com/rcsb/py-rcsb_exdb
 Author-email: John Westbrook <john.westbrook@rcsb.org>
@@ -26,7 +26,7 @@ Requires-Dist: rcsb-utils-ec>=0.25
 Requires-Dist: rcsb-utils-go>=0.18
 Requires-Dist: rcsb-utils-io>=1.48
 Requires-Dist: rcsb-utils-seq>=0.82
-Requires-Dist: rcsb-utils-struct>=0.47
+Requires-Dist: rcsb-utils-struct>=0.51
 Requires-Dist: rcsb-utils-targets>=0.82
 Requires-Dist: rcsb-utils-taxonomy>=0.43
 Provides-Extra: tests

{rcsb_exdb-1.31.dist-info → rcsb_exdb-1.33.dist-info}/RECORD

@@ -43,44 +43,7 @@ rcsb/exdb/seq/TaxonomyExtractor.py,sha256=I7jsb5Kanrnh4X-znl9kZPZMJ7o2dp4fsnp2IW
 rcsb/exdb/seq/UniProtCoreEtlWorker.py,sha256=-fEojXF3lAJ1tbMsPIxT9In6ooiPThuKSoIRQ0YlZ1s,7590
 rcsb/exdb/seq/UniProtExtractor.py,sha256=pR_A9e82YvbQ813M8rNPu1bCPOHMjGnCqJmLDMM23Qo,2695
 rcsb/exdb/seq/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rcsb/exdb/tests/TEST-EXDB-CLI-EXEC.sh,sha256=DWiM-DeyG_GFRki4WWSIl41ErYVxrp8t0lPypizterc,778
-rcsb/exdb/tests/TEST-EXDB-CLI-REFSEQ-EXEC.sh,sha256=CPQ8rRpfBVIl5r6IFt2t-P4aBBIWUo4NioR7M0LM6Nc,769
-rcsb/exdb/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rcsb/exdb/tests/fixtureDictMethodResourceProvider.py,sha256=h_iRfmZR9UG0nFYnVoPDtAE3VPpyrnwJRXbrdfeh0gY,3999
-rcsb/exdb/tests/fixturePdbxLoader.py,sha256=wfXyJ4k2Z-85J6sCSArf-eAuYQVbsTilwWmnm8cNPa4,10167
-rcsb/exdb/tests/testAnnotationExtractor.py,sha256=rpeB4RtOcYD27S3ZwnePHHSaac2j4bmvqfu-wJ5254U,2657
-rcsb/exdb/tests/testBranchedEntityExtractor.py,sha256=efchTzuQylD7L7Kc0j-rEvBeLjnPzvSWVLA8I7JIBys,2936
-rcsb/exdb/tests/testChemRefLoader.py,sha256=pZqWiSIQZ9bfZMJplw_ym9swCe0N6rjq63mfcqWtNO0,3696
-rcsb/exdb/tests/testChemRefMappingProvider.py,sha256=wxypTg-Y5DsAksT4a2x2yh1_JCf-7HqP9z0jKDmNcNg,3353
-rcsb/exdb/tests/testCitationAdapter.py,sha256=ZlvG6aTHzKVnREj3LXQd1iniwC-KXR45vbyzBgdoiu8,3625
-rcsb/exdb/tests/testCitationExtractor.py,sha256=7Xg75JHtnZkfrFnZVNggLRVFeRNW6V5O0tGse40C9fc,3141
-rcsb/exdb/tests/testCitationUtils.py,sha256=lCn5n_49vAnQIaUd4fSY-sQ6Ld5r5G32WRaprErryo8,3064
-rcsb/exdb/tests/testEntryInfoEtlWorkflow.py,sha256=TutfC949U0nDkFbmMdXo_MgbxMfvll4O-5C7N8Qj3TA,2340
-rcsb/exdb/tests/testEntryInfoProvider.py,sha256=2Ti-o2A8QlB0reJHFqXHjyrvehlLRFtycFhCTBTY_d0,3360
-rcsb/exdb/tests/testGlycanEtlWorkflow.py,sha256=Olml-71jiWAGOU-NQNHiRSPrew7RJtLK3R6u6WTlUSc,2295
-rcsb/exdb/tests/testGlycanProvider.py,sha256=n15qTncV289o-E5J_AsizPW1tgeCHZH8A7_qXG2Afr4,3201
-rcsb/exdb/tests/testGlycanUtils.py,sha256=h59g_iuEEzhcWRW50VdYlRHw3UrpqiRYgJZKDU4C9Wc,1953
-rcsb/exdb/tests/testLigandNeighborMappingProvider.py,sha256=JjY4y5a4ZuZPJ4gdOxIwRLVz5U6F0f0K963OeDZmFAM,3144
-rcsb/exdb/tests/testObjectExtractor.py,sha256=aHP6q9UQqDFd44u8KNQrnfTWy8Rf9dQ8FnHhUHAmqq0,14122
-rcsb/exdb/tests/testObjectTransformer.py,sha256=7fPWTfN4G6wFj6MZkw_L0dtONMsVBlBCzoHvxzrgsUo,2944
-rcsb/exdb/tests/testObjectUpdater.py,sha256=Kq-Mk4ZbD-eMoIsR3zGJvamFq-OEX4tFXyPB9FePWxc,4950
-rcsb/exdb/tests/testPolymerEntityExtractor.py,sha256=RTsEWZDarrtdVn2Xy7fbPIrZTw7Nd9VJ21aBBr3QFU0,3536
-rcsb/exdb/tests/testPubChemDataCacheProvider.py,sha256=K2Fg4Bibtdg9Z9zLwwJqZDa-XlIKHiSb9A6ewIa2-sM,4679
-rcsb/exdb/tests/testPubChemEtlWorkflow.py,sha256=vENOnc7D-EukdjElvhsZqTL0h5N6alPso4Gn3rDNMXg,5187
-rcsb/exdb/tests/testPubChemEtlWrapper.py,sha256=yGg0HvtYvFTvEEK9OsqvSSRVzCIG90UPEK_Lh7SifAk,6511
-rcsb/exdb/tests/testPubChemIndexCacheProvider.py,sha256=KVPfgnMdp7V57LnuwLLkbcZ-DjGHdEx4q0V1RAyOCXw,4947
-rcsb/exdb/tests/testReferenceSequenceAnnotationAdapter.py,sha256=hABmh743REIhFe3vP_dKr0uUvUH6-Ci71fpHGUIzt6E,4495
-rcsb/exdb/tests/testReferenceSequenceAssignmentAdapter.py,sha256=g9-t6-TMZNqxtjgZy9cYCXA19ZkOfjb0un7o8sasuAA,4897
-rcsb/exdb/tests/testReferenceSequenceAssignmentAdapterValidate.py,sha256=p3wPa-9_Il9eHP3fQGI1ag2FE0mvuOdeGu2uet6APOU,5005
-rcsb/exdb/tests/testReferenceSequenceAssignmentProvider.py,sha256=6qzk-xt0QVrX4IC8Ml6HnDzFcee14vIUs14AKAWFg9w,4631
-rcsb/exdb/tests/testReferenceSequenceCacheProvider.py,sha256=thQnpv1dxnL46PfZS6alhyS2N_rnATRmvh8SU9HJHAM,3469
-rcsb/exdb/tests/testTaxonomyExtractor.py,sha256=NZv0UFBnnRUxQN3gzPIruOqyJEG6F81avI8tQu9ILao,2536
-rcsb/exdb/tests/testTreeNodeListWorker.py,sha256=PiVaSOG0140fonhHsp0yxft3KlYaBzDb2hwmPKZxy5Y,3653
-rcsb/exdb/tests/testUniProtCoreEtlWorker.py,sha256=8LyJjeMiKkGSYZ1641xpO1clKSJSESWrHywrNqMeJ9o,3403
-rcsb/exdb/tests/testUniProtExtractor.py,sha256=jNNAI1GIedEbZhpdG1C9CjuZskUwxFg8jxgZJi1tr2U,2604
-rcsb/exdb/tests/test-data/components-abbrev.cif,sha256=Vodm2R_8ipO2X4e8W3Wa1MiH3YF7RSczdtXC0TA13sM,139314
-rcsb/exdb/tests/test-data/prdcc-abbrev.cif,sha256=pA2yCImadbuh51q59fdIOsGnyXVBPFv-8Z8Zrk2jUqA,415606
-rcsb/exdb/tree/TreeNodeListWorker.py,sha256=VLd7MWCxw9fONoC3xYbjvARp2O2V8Vyy-kUZnwQWi30,10233
+rcsb/exdb/tree/TreeNodeListWorker.py,sha256=jaCe21zVfj5h5g_n5ibwG33JoaX0nBqXCSLiw8DSF0A,10903
 rcsb/exdb/tree/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 rcsb/exdb/utils/ObjectAdapterBase.py,sha256=w-MGvs-TFQXzfgOfAX3aNyCfaN9gY8WP-7MU2FcMAYs,466
 rcsb/exdb/utils/ObjectExtractor.py,sha256=fAJ-WW_-80h_s_XSDdZYi1I2pltb-uQ3teOtCkcyznk,11057
@@ -92,7 +55,7 @@ rcsb/exdb/wf/EntryInfoEtlWorkflow.py,sha256=YVr75Wz1BPjLr_satd28B9BeD3QL6HwmkR17
 rcsb/exdb/wf/GlycanEtlWorkflow.py,sha256=oJ6wf438K2e-eLmy8Ni3MCPxjAKgVJY38SWO885gnmg,2820
 rcsb/exdb/wf/PubChemEtlWorkflow.py,sha256=fNX3A6kf0S1XiJMz7ywNpFuuua5lT3XaUFjcCJtvQsU,11235
 rcsb/exdb/wf/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-rcsb_exdb-1.31.dist-info/METADATA,sha256=QWvZc5fDZqWlHPTXgBsRhu8Q7W7yZy4hOSp6sMJGxuk,3845
-rcsb_exdb-1.31.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-rcsb_exdb-1.31.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-rcsb_exdb-1.31.dist-info/RECORD,,
+rcsb_exdb-1.33.dist-info/METADATA,sha256=0_XboU3Pyut6e2JCDds5wE4pPVFJHGoCMnlvOtZckME,3845
+rcsb_exdb-1.33.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+rcsb_exdb-1.33.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+rcsb_exdb-1.33.dist-info/RECORD,,

rcsb/exdb/tests/TEST-EXDB-CLI-EXEC.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-# File: TEST-EXDB-CL-EXEC.sh
-# Date: 3-Sep-2019 jdw
-#
-# Examples
-#
-# tree node list load
-#
-exdb_exec_cli --mock --full --etl_tree_node_lists --rebuild_cache --cache_path ../../../CACHE  --config_path ../../mock-data/config/dbload-setup-example.yml --config_name site_info_configuration >& ./test-output/LOGTREENODELIST
-#
-# Chemref load
-#
-exdb_exec_cli --mock --full --etl_chemref --cache_path ../../../CACHE  --config_path ../../mock-data/config/dbload-setup-example.yml --config_name site_info_configuration >& ./test-output/LOGCHEMREF
-#
-# Reference sequence update
-#
-exdb_exec_cli --mock --upd_ref_seq --cache_path ../../../CACHE  --config_path ../../mock-data/config/dbload-setup-example.yml --config_name site_info_configuration >& ./test-output/LOGUPDREFSEQ
-#
-#

rcsb/exdb/tests/TEST-EXDB-CLI-REFSEQ-EXEC.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-# File: TEST-EXDB-CLI-REFSEQ-EXEC.sh
-# Date: 17-Oct-2019 jdw
-#
-# Reference sequence update --mock is required for example SIFTS files -
-#
-exdb_exec_cli --mock  --upd_ref_seq --cache_path ../../../CACHE  --config_path ../../mock-data/config/dbload-setup-example.yml --config_name site_info_configuration >& ./test-output/LOGUPDREFSEQ
-#
-exdb_exec_cli --test_req_seq_cache --mock  --upd_ref_seq --cache_path ../../../CACHE  --config_path ../../mock-data/config/dbload-setup-example.yml --config_name site_info_configuration >& ./test-output/LOGUPDREFSEQTEST
-#
-exdb_exec_cli --mock --full --etl_uniprot --cache_path ../../../CACHE  --config_path ../../mock-data/config/dbload-setup-example.yml --config_name site_info_configuration >& ./test-output/LOGUNIPROT
-#

rcsb/exdb/tests/fixtureDictMethodResourceProvider.py

@@ -1,104 +0,0 @@
-# File:    DictMethodResourceProviderFixture.py
-# Author:  J. Westbrook
-# Date:    12-Aug-2019
-# Version: 0.001
-#
-# Update:
-
-##
-"""
-Fixture for setting up cached resources for dictionary method helpers
-
-"""
-
-__docformat__ = "google en"
-__author__ = "John Westbrook"
-__email__ = "jwest@rcsb.rutgers.edu"
-__license__ = "Apache 2.0"
-
-import logging
-import os
-import platform
-import resource
-import time
-import unittest
-
-from rcsb.utils.config.ConfigUtil import ConfigUtil
-from rcsb.utils.dictionary.DictMethodResourceProvider import DictMethodResourceProvider
-
-logging.basicConfig(level=logging.INFO, format="%(asctime)s [%(levelname)s]-%(module)s.%(funcName)s: %(message)s")
-logger = logging.getLogger()
-logger.setLevel(logging.INFO)
-
-HERE = os.path.abspath(os.path.dirname(__file__))
-TOPDIR = os.path.dirname(os.path.dirname(os.path.dirname(HERE)))
-
-
-class DictMethodResourceProviderFixture(unittest.TestCase):
-    def setUp(self):
-        self.__cachePath = os.path.join(TOPDIR, "CACHE")
-        mockTopPath = os.path.join(TOPDIR, "rcsb", "mock-data")
-        configPath = os.path.join(TOPDIR, "rcsb", "mock-data", "config", "dbload-setup-example.yml")
-        configName = "site_info_configuration"
-        self.__configName = configName
-        self.__cfgOb = ConfigUtil(configPath=configPath, defaultSectionName=configName, mockTopPath=mockTopPath)
-
-        self.__startTime = time.time()
-        logger.debug("Starting %s at %s", self.id(), time.strftime("%Y %m %d %H:%M:%S", time.localtime()))
-
-    def tearDown(self):
-        unitS = "MB" if platform.system() == "Darwin" else "GB"
-        rusageMax = resource.getrusage(resource.RUSAGE_SELF).ru_maxrss
-        logger.info("Maximum resident memory size %.4f %s", rusageMax / 10 ** 6, unitS)
-        endTime = time.time()
-        logger.info("Completed %s at %s (%.4f seconds)", self.id(), time.strftime("%Y %m %d %H:%M:%S", time.localtime()), endTime - self.__startTime)
-
-    def testBuildResourceCache(self):
-        """Fixture - generate and check selected resource caches"""
-        try:
-            resourceNameL = [
-                "AtcProvider instance",
-                "DrugBankProvider instance",
-                "PubChemProvider instance",
-                "CitationReferenceProvider instance",
-                "JournalTitleAbbreviationProvider instance",
-                "EnzymeDatabaseProvider instance",
-                "PfamProvider instance",
-                "SiftsSummaryProvider instance",
-                "CathProvider instance",
-                "ScopProvider instance",
-                "EcodProvider instance",
-                "Scop2Provider instance",
-                "TaxonomyProvider instance",
-            ]
-            rP = DictMethodResourceProvider(self.__cfgOb, configName=self.__configName, cachePath=self.__cachePath, restoreUseStash=False, restoreUseGit=True)
-            for resourceName in resourceNameL:
-                rP.getResource(resourceName, useCache=True, default=None, doRestore=True, doBackup=False)
-            #
-        except Exception as e:
-            logger.exception("Failing with %s", str(e))
-            self.fail()
-
-    @unittest.skip("Troubleshooting test")
-    def testRecoverResourceCache(self):
-        """Fixture - generate and check resource caches"""
-        try:
-            rp = DictMethodResourceProvider(self.__cfgOb, configName=self.__configName, cachePath=self.__cachePath)
-            ret = rp.cacheResources(useCache=True)
-            self.assertTrue(ret)
-        except Exception as e:
-            logger.exception("Failing with %s", str(e))
-            self.fail()
-
-
-def dictMethodResourceProviderSuite():
-    suiteSelect = unittest.TestSuite()
-    suiteSelect.addTest(DictMethodResourceProviderFixture("testBuildResourceCache"))
-    # suiteSelect.addTest(DictMethodResourceProviderFixture("testRecoverResourceCache"))
-    return suiteSelect
-
-
-if __name__ == "__main__":
-
-    mySuite = dictMethodResourceProviderSuite()
-    unittest.TextTestRunner(verbosity=2).run(mySuite)