nit picks

Author: sbryngelson

toolchain/mfc/test/test.py

@@ -108,6 +108,14 @@ def test():
     global nFAIL, nPASS, nSKIP, total_test_count
     global errors
 
+    # Reset globals to ensure clean state
+    nFAIL = 0
+    nPASS = 0
+    nSKIP = 0
+    total_test_count = 0
+    errors = []
+    abort_tests.clear()
+
     cases = list_cases()
 
     # Delete UUIDs that are not in the list of cases from tests/
@@ -219,7 +227,7 @@ def _process_silo_file(silo_filepath: str, case: TestCase, out_filepath: str):
 
     h5dump = f"{HDF5.get_install_dirpath(case.to_input_file())}/bin/h5dump"
 
-    if not os.path.exists(h5dump or ""):
+    if not os.path.exists(h5dump):
         if not does_command_exist("h5dump"):
             raise MFCException("h5dump couldn't be found.")
         h5dump = shutil.which("h5dump")
@@ -314,6 +322,9 @@ def _handle_case(case: TestCase, devices: typing.Set[int]):
         cons.print(f"  [bold magenta]{case.get_uuid()}[/bold magenta]     SKIP     {case.trace}")
         return
 
+    # Track current log file for timeout reporting
+    current_log_path = os.path.join(case.get_dirpath(), "out_pre_sim.txt")
+
     try:
         cmd = case.run([PRE_PROCESS, SIMULATION], gpus=devices, timeout=TEST_TIMEOUT_SECONDS)
 
@@ -363,9 +374,10 @@ def _handle_case(case: TestCase, devices: typing.Set[int]):
 
             # Run full pipeline: this ensures simulation and post_process use
             # consistent configuration (parallel_io, file_per_process, etc.)
+            current_log_path = os.path.join(case.get_dirpath(), "out_post.txt")
             cmd = case.run([PRE_PROCESS, SIMULATION, POST_PROCESS], gpus=devices, timeout=TEST_TIMEOUT_SECONDS)
 
-            out_post_filepath = os.path.join(case.get_dirpath(), "out_post.txt")
+            out_post_filepath = current_log_path
             common.file_write(out_post_filepath, cmd.stdout)
 
             if cmd.returncode != 0:
@@ -398,12 +410,11 @@ def _handle_case(case: TestCase, devices: typing.Set[int]):
 
     except subprocess.TimeoutExpired as exc:
         # Subprocess timeout - the process was actually killed
-        log_path = os.path.join(case.get_dirpath(), 'out_pre_sim.txt')
-        if os.path.exists(log_path):
-            log_msg = f"Check the log at: {log_path}"
+        if os.path.exists(current_log_path):
+            log_msg = f"Check the log at: {current_log_path}"
         else:
             log_msg = (
-                f"Log file ({log_path}) may not exist if the timeout occurred early."
+                f"Log file ({current_log_path}) may not exist if the timeout occurred early."
             )
         raise MFCException(
             f"Test {case} exceeded 1 hour timeout (process was killed). "
@@ -428,6 +439,9 @@ def handle_case(case: TestCase, devices: typing.Set[int]):
         max_attempts = ARG('max_attempts')
 
     while True:
+        if abort_tests.is_set():
+            return
+
         nAttempts += 1
 
         try: