cvxpy/tests/test_conic_solvers.py: Fix test for coin-or/CyLP#150

mkoeppe · Mar 16, 2022 · ba9a4d1 · ba9a4d1
1 parent a166fc8
commit ba9a4d1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/cvxpy/tests/test_conic_solvers.py b/cvxpy/tests/test_conic_solvers.py
@@ -589,10 +589,11 @@ def setUp(self) -> None:
         self.B = cp.Variable((2, 2), name='B')
         self.C = cp.Variable((3, 2), name='C')
 
-    def _cylp_has_isProvenInfeasible():
+    def _cylp_checks_isProvenInfeasible():
         try:
-            from cylp.cy.CyCbcModel import CyCbcModel
-            return hasattr(CyCbcModel, 'isProvenInfeasible')
+            # https://github.com/coin-or/CyLP/pull/150
+            from cylp.cy.CyCbcModel import problemStatus
+            return problemStatus[0] == 'search completed'
         except ImportError:
             return False
 
@@ -647,7 +648,7 @@ def test_cbc_mi_lp_2(self) -> None:
     def test_cbc_mi_lp_3(self) -> None:
         StandardTestLPs.test_mi_lp_3(solver='CBC')
 
-    @unittest.skipUnless(_cylp_has_isProvenInfeasible(),
+    @unittest.skipUnless(_cylp_checks_isProvenInfeasible(),
                          'CyLP <= 0.91.4 has no working integer infeasibility detection')
     def test_cbc_mi_lp_5(self) -> None:
         StandardTestLPs.test_mi_lp_5(solver='CBC')