Attempt to fix test_mcupdater in CI

capstone-engine · Aug 26, 2024 · bc540d9 · bc540d9
1 parent 7c4c3ea
commit bc540d9
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/suite/auto-sync/.gitignore b/suite/auto-sync/.gitignore
@@ -4,6 +4,8 @@ vendor/llvm_root
 src/auto-sync/config.json
 src/autosync/cpptranslator/Tests/Differ/test_saved_patches.json
 src/autosync.egg-info
+src/autosync/Tests/MCUpdaterTests/ARCH/Output
+src/autosync/Tests/MCUpdaterTests/Disassembler/ARCH/Output
 src/autosync/lit_config/test_dir_*
 src/autosync/lit_config/.lit_test_times.txt
 src/autosync/Tests/MCUpdaterTests/test_output
diff --git a/suite/auto-sync/src/autosync/Tests/MCUpdaterTests/ARCH/Output/test_b.txt.script b/suite/auto-sync/src/autosync/Tests/MCUpdaterTests/ARCH/Output/test_b.txt.script
diff --git a/suite/auto-sync/src/autosync/Tests/MCUpdaterTests/ARCH/Output/test_c.txt.script b/suite/auto-sync/src/autosync/Tests/MCUpdaterTests/ARCH/Output/test_c.txt.script
diff --git a/suite/auto-sync/src/autosync/Tests/MCUpdaterTests/Disassembler/ARCH/Output/test_a.txt.script b/suite/auto-sync/src/autosync/Tests/MCUpdaterTests/Disassembler/ARCH/Output/test_a.txt.script
diff --git a/suite/auto-sync/src/autosync/Tests/test_mcupdater.py b/suite/auto-sync/src/autosync/Tests/test_mcupdater.py
@@ -12,6 +12,9 @@
 from autosync.MCUpdater import MCUpdater
 
 
+mutex = Lock()
+
+
 class TestHeaderPatcher(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
@@ -21,10 +24,9 @@ def setUpClass(cls):
             format="%(levelname)-5s - %(message)s",
             force=True,
         )
-        cls.mutex = Lock()
 
     def test_unified_test_cases(self):
-        with self.mutex:
+        with mutex:
             out_dir = Path(
                 get_path("{MCUPDATER_TEST_OUT_DIR}")
                 .joinpath("merged")
@@ -48,7 +50,7 @@ def test_unified_test_cases(self):
             )
 
     def test_separated_test_cases(self):
-        with self.mutex:
+        with mutex:
             out_dir = Path(
                 get_path("{MCUPDATER_TEST_OUT_DIR}")
                 .joinpath("merged")
@@ -72,7 +74,7 @@ def test_separated_test_cases(self):
             )
 
     def test_multi_mode_unified_test_cases(self):
-        with self.mutex:
+        with mutex:
             out_dir = Path(
                 get_path("{MCUPDATER_TEST_OUT_DIR}")
                 .joinpath("multi")
@@ -103,7 +105,7 @@ def test_multi_mode_unified_test_cases(self):
             )
 
     def test_multi_mode_separated_test_cases(self):
-        with self.mutex:
+        with mutex:
             out_dir = Path(
                 get_path("{MCUPDATER_TEST_OUT_DIR}")
                 .joinpath("multi")
@@ -163,6 +165,8 @@ def compare_files(self, out_dir: Path, filenames: list[str]) -> bool:
                 actual = f.read()
             if expected != actual:
                 logging.error("Files mismatch")
+                print(f"Expected: {efile}")
+                print(f"Actual: {afile}\n")
                 print(f"Expected:\n\n{expected}\n")
                 print(f"Actual:\n\n{actual}\n")
                 return False