Tests and pre-commit checks passing

Author: forsyth2

tests/test_check.py

@@ -122,33 +122,33 @@ def helperCheckVerboseMismatch(self, test_name, hpss_path, zstash_path=ZSTASH_PA
         )
         os.chdir(TOP_LEVEL)
 
-    # def testCheck(self):
-    #     self.helperCheck("testCheck", "none")
+    def testCheck(self):
+        self.helperCheck("testCheck", "none")
 
-    # def testCheckHPSS(self):
-    #     self.conditional_hpss_skip()
-    #     self.helperCheck("testCheckHPSS", HPSS_ARCHIVE)
+    def testCheckHPSS(self):
+        self.conditional_hpss_skip()
+        self.helperCheck("testCheckHPSS", HPSS_ARCHIVE)
 
-    # def testCheckCache(self):
-    #     self.helperCheck("testCheckCache", "none", cache="my_cache")
+    def testCheckCache(self):
+        self.helperCheck("testCheckCache", "none", cache="my_cache")
 
-    # def testCheckCacheHPSS(self):
-    #     self.conditional_hpss_skip()
-    #     self.helperCheck("testCheckCacheHPSS", HPSS_ARCHIVE, cache="my_cache")
+    def testCheckCacheHPSS(self):
+        self.conditional_hpss_skip()
+        self.helperCheck("testCheckCacheHPSS", HPSS_ARCHIVE, cache="my_cache")
 
-    # def testCheckVerboseMismatch(self):
-    #     self.helperCheckVerboseMismatch("testCheckVerboseMismatch", "none")
+    def testCheckVerboseMismatch(self):
+        self.helperCheckVerboseMismatch("testCheckVerboseMismatch", "none")
 
-    # def testCheckVerboseMismatchHPSS(self):
-    #     self.conditional_hpss_skip()
-    #     self.helperCheckVerboseMismatch("testCheckVerboseMismatchHPSS", HPSS_ARCHIVE)
+    def testCheckVerboseMismatchHPSS(self):
+        self.conditional_hpss_skip()
+        self.helperCheckVerboseMismatch("testCheckVerboseMismatchHPSS", HPSS_ARCHIVE)
 
-    # def testCheckTars(self):
-    #     helperCheckTars(self, "testCheckTars", "none")
+    def testCheckTars(self):
+        helperCheckTars(self, "testCheckTars", "none")
 
-    # def testCheckTarsHPSS(self):
-    #     self.conditional_hpss_skip()
-    #     helperCheckTars(self, "testCheckTarsHPSS", HPSS_ARCHIVE)
+    def testCheckTarsHPSS(self):
+        self.conditional_hpss_skip()
+        helperCheckTars(self, "testCheckTarsHPSS", HPSS_ARCHIVE)
 
     def testCheckKeepTars(self):
         """

zstash/update.py

@@ -163,7 +163,7 @@ def update_database(  # noqa: C901
     # Eliminate files that are already archived and up to date
     newfiles: List[str] = []
     for file_path in files:
-        #logger.debug(f"file_path={file_path}")
+        # logger.debug(f"file_path={file_path}")
         statinfo: os.stat_result = os.lstat(file_path)
         mdtime_new: datetime = datetime.utcfromtimestamp(statinfo.st_mtime)
         mode: int = statinfo.st_mode
@@ -180,7 +180,7 @@ def update_database(  # noqa: C901
         while True:
             # Get the corresponding row in the 'files' table
             match_: Optional[TupleFilesRow] = cur.fetchone()
-            #logger.debug(f"match_={match_}")
+            # logger.debug(f"match_={match_}")
             if match_ is None:
                 break
             else:

zstash/utils.py

@@ -115,7 +115,9 @@ def update_config_using_db(self, cur: sqlite3.Cursor):
                 value = cur.fetchone()[0]
                 # Update config with the new attribute-value pair
                 setattr(self.config, attr, value)
-        logger.debug(f"Updated config using db. Now, maxsize={self.config.maxsize}, path={self.config.path}, hpss={self.config.hpss}, hpss_type={self.hpss_type}")
+        logger.debug(
+            f"Updated config using db. Now, maxsize={self.config.maxsize}, path={self.config.path}, hpss={self.config.hpss}, hpss_type={self.hpss_type}"
+        )
 
     def get_db_name(self) -> str:
         return os.path.join(self.cache_dir, "index.db")