Merge branch 'main' into citation

IDAES · Jan 19, 2024 · 09788ce · 09788ce
2 parents ecc31c6 + e875d80
commit 09788ce
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/idaes/core/util/tests/test_model_diagnostics.py b/idaes/core/util/tests/test_model_diagnostics.py
@@ -1798,6 +1798,10 @@ def test_identify_candidates(self, model):
             model.con5: 1e-05,
         }
 
+    @pytest.mark.xfail(
+        reason="Known failure. See IDAES/idaes-pse#1317 for details",
+        strict=True,
+    )
     @pytest.mark.solver
     @pytest.mark.component
     def test_solve_candidates_milp(self, model, scip_solver):
@@ -1847,6 +1851,7 @@ def test_solve_ids_milp(self, model):
             model.con5: -1,
         }
 
+    # TODO does this test function have the exact same name as the one above?
     @pytest.mark.solver
     @pytest.mark.component
     def test_solve_ids_milp(self, model, scip_solver):