#810 #810 NRT tests with a zip archive in diff.py

Signed-off-by: Dimitri Baron <[email protected]>
dynawo · Jan 22, 2025 · 0e0a374 · 0e0a374
1 parent e438869
commit 0e0a374
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/scripts/diff.py b/scripts/diff.py
@@ -78,6 +78,8 @@ def get_argparser():
 
         outputiidm_result_paths = list()
         outputiidm_result_paths.append(os.path.realpath(os.path.join(results_root, "outputs/finalState/outputIIDM.xml")))
+        if options.output_zip:
+            outputiidm_result_paths.append(os.path.realpath(os.path.join(results_root, "output/outputs/finalState/outputIIDM.xml")))
         outputiidm_reference_path = os.path.realpath(os.path.join(reference_root, "outputIIDM.xml"))
 
         if not os.path.exists(outputiidm_reference_path):
@@ -101,6 +103,8 @@ def get_argparser():
             #constraints
             constraints_result_paths = list()
             constraints_result_paths.append(os.path.realpath(os.path.join(results_root, "outputs/constraints/constraints.xml")))
+            if options.output_zip:
+                constraints_result_paths.append(os.path.realpath(os.path.join(results_root, "output/outputs/constraints/constraints.xml")))
             constraints_reference_path = os.path.realpath(os.path.join(reference_root, "constraints.xml"))
 
             if not os.path.exists(constraints_reference_path):
@@ -122,6 +126,8 @@ def get_argparser():
             #lost equipments
             lost_equipments_result_paths = list()
             lost_equipments_result_paths.append(os.path.realpath(os.path.join(results_root, "outputs/lostEquipments/lostEquipments.xml")))
+            if options.output_zip:
+                lost_equipments_result_paths.append(os.path.realpath(os.path.join(results_root, "output/outputs/lostEquipments/lostEquipments.xml")))
             lost_equipments_reference_path = os.path.realpath(os.path.join(reference_root, "lostEquipments.xml"))
 
             if not os.path.exists(lost_equipments_reference_path):