Get tests on Perlmutter passing

Author: forsyth2

tests/scripts/database_corruption.bash

@@ -1,5 +1,3 @@
-# TODO: Run the unit tests on Perlmutter
-
 setup()
 {
   echo "##########################################################################################################"

tests/test_check.py

@@ -184,15 +184,18 @@ def testCheckKeepTars(self):
             "{}zstash extract --hpss={}".format(zstash_path, self.hpss_path)
         )
         # Run `zstash check`
-        output, err = run_cmd(
-            "{}zstash check --hpss={}".format(zstash_path, self.hpss_path)
-        )
-        self.assertEqualOrStop(
-            output + err,
-            'For help, please see https://e3sm-project.github.io/zstash. Ask questions at https://github.com/E3SM-Project/zstash/discussions/categories/q-a.\nINFO: zstash/000000.tar exists. Checking expected size matches actual size.\nINFO: Opening tar archive {}/000000.tar\nINFO: Checking file1.txt\nINFO: Checking file2.txt\nINFO: No failures detected when checking the files. If you have a log file, run "grep -i Exception <log-file>" to double check.\n'.format(
-                self.cache
-            ),
-        )
+        zstash_cmd: str = f"{zstash_path}zstash check --hpss={self.hpss_path}"
+        output, err = run_cmd(zstash_cmd)
+        expected_present = [
+            "For help, please see https://e3sm-project.github.io/zstash. Ask questions at https://github.com/E3SM-Project/zstash/discussions/categories/q-a.",
+            "INFO: zstash/000000.tar exists. Checking expected size matches actual size.",
+            f"INFO: Opening tar archive {self.cache}/000000.tar",
+            "INFO: Checking file1.txt",
+            "INFO: Checking file2.txt",
+            'INFO: No failures detected when checking the files. If you have a log file, run "grep -i Exception <log-file>" to double check.',
+        ]
+        expected_absent = []
+        self.check_strings(zstash_cmd, output + err, expected_present, expected_absent)
         # Check that tar and db files were not deleted
         files = os.listdir("{}/".format(self.cache))
         if not compare(files, ["000000.tar", "index.db"]):

tests/test_extract_parallel.py

@@ -1,6 +1,8 @@
 import os
+import re
 import shutil
 import unittest
+from typing import List
 
 from tests.base import (
     HPSS_ARCHIVE,
@@ -72,18 +74,7 @@ def helperExtractParallel(self, test_name, hpss_path, zstash_path=ZSTASH_PATH):
             expected_present.append("Transferring file from HPSS")
         expected_absent = ["ERROR", "Not extracting"]
         self.check_strings(cmd, output + err, expected_present, expected_absent)
-        # Checking that the printing was done in order.
-        tar_order = []
-        console_output = output + err
-        for word in console_output.replace("\n", " ").split(" "):
-            if ".tar" in word:
-                word = word.replace("{}/".format(self.cache), "")
-                tar_order.append(word)
-        if tar_order != sorted(tar_order):
-            error_message = "The tars were printed in this order: {}\nWhen it should have been in this order: {}".format(
-                tar_order, sorted(tar_order)
-            )
-            self.stop(error_message)
+        self.compare_tar_orders(output + err)
 
         # Run again, without verbose option.
         shutil.rmtree(self.test_dir)
@@ -99,17 +90,18 @@ def helperExtractParallel(self, test_name, hpss_path, zstash_path=ZSTASH_PATH):
         output, err = run_cmd(cmd)
         os.chdir(TOP_LEVEL)
         self.check_strings(cmd, output + err, expected_present, expected_absent)
-        # Checking that the printing was done in order.
-        tar_order = []
-        console_output = output + err
+        self.compare_tar_orders(output + err)
+
+    def compare_tar_orders(self, console_output: str):
+        printed_tar_order: List[int] = []
         for word in console_output.replace("\n", " ").split(" "):
-            if ".tar" in word:
-                word = word.replace("{}/".format(self.cache), "")
-                tar_order.append(word)
-        if tar_order != sorted(tar_order):
-            error_message = "The tars were printed in this order: {}\nWhen it should have been in this order: {}".format(
-                tar_order, sorted(tar_order)
-            )
+            match_object = re.match(r"([0-9a-fA-F]+)\.tar", word)
+            if match_object:
+                hex_value: int = int(match_object.group(1), 16)
+                printed_tar_order.append(hex_value)
+        sorted_tar_order: List[int] = sorted(printed_tar_order)
+        if printed_tar_order != sorted_tar_order:
+            error_message = f"Actual tar order={printed_tar_order}. Expected tar order={sorted_tar_order}"
             self.stop(error_message)
 
     def testExtractParallel(self):