fix test

Author: RobbieKiwi

test/test_optimization.py

@@ -373,29 +373,32 @@ def test_default_setting(
 def test_default_setting_sol_and_dual_accessor(
     model: Model, solver: str, io_api: str, explicit_coordinate_names: bool
 ) -> None:
-    def run_one():
-        status, _ = model.solve(
-            solver, io_api=io_api, explicit_coordinate_names=explicit_coordinate_names
-        )
-        assert status == "ok"
-        x = model["x"]
-        assert_equal(x.solution, model.solution["x"])
-        c = model.constraints["con1"]
-        assert_equal(c.dual, model.dual["con1"])
-        # squeeze in dual getter in matrix
-        assert len(model.matrices.dual) == model.ncons
-        assert model.matrices.dual[0] == model.dual["con0"]
-
-    if solver != "xpress":
-        run_one()
-        return
-
-    # Solver is xpress
-
-    run_one()
-    with patch("xpress.__version__", 9.5):
-        # Test the legacy behaviour for xpress version 9.5
-        run_one()
+    status, _ = model.solve(
+        solver, io_api=io_api, explicit_coordinate_names=explicit_coordinate_names
+    )
+    assert status == "ok"
+    x = model["x"]
+    assert_equal(x.solution, model.solution["x"])
+    c = model.constraints["con1"]
+    assert_equal(c.dual, model.dual["con1"])
+    # squeeze in dual getter in matrix
+    assert len(model.matrices.dual) == model.ncons
+    assert model.matrices.dual[0] == model.dual["con0"]
+
+
+def test_old_xpress_version(model: Model) -> None:
+    solver = "xpress"
+
+    with patch("xpress.__version__", "9.5.0"):
+        status, _ = model.solve(solver)
+    assert status == "ok"
+    x = model["x"]
+    assert_equal(x.solution, model.solution["x"])
+    c = model.constraints["con1"]
+    assert_equal(c.dual, model.dual["con1"])
+    # squeeze in dual getter in matrix
+    assert len(model.matrices.dual) == model.ncons
+    assert model.matrices.dual[0] == model.dual["con0"]
 
 
 @pytest.mark.parametrize("solver,io_api,explicit_coordinate_names", params)