Fix tests that were being missed

Author: staadecker

tests/test_io.py

@@ -75,7 +75,6 @@ def test_constraint_to_str(solver):
     )
 
 
-@pytest.mark.parametrize("use_var_names", [True, False])
 def test_write_lp(use_var_names, solver):
     if not solver.supports_write:
         pytest.skip(f"{solver.name} does not support writing LP files.")
@@ -93,8 +92,8 @@ def test_write_lp(use_var_names, solver):
         m.minimize = sum(cities[["country", "city", "rent"]] * m.population)
         m.total_pop = sum(m.population) >= 310
         m.capacity_constraint = m.population <= cities[["country", "city", "capacity"]]
-        file_path = os.path.join(tmpdir, "test.lp")
 
+        file_path = os.path.join(tmpdir, "test.lp")
         m.write(file_path)
         m.optimize()
         obj_value = m.objective.value
@@ -109,7 +108,6 @@ def test_write_lp(use_var_names, solver):
                 assert "population[CAN,Toronto]" not in f.read()
 
 
-@pytest.mark.parametrize("use_var_names", [True, False])
 def test_write_sol(use_var_names, solver):
     if not solver.supports_write:
         pytest.skip(f"{solver.name} does not support writing solution files.")

tests/test_solver.py

@@ -26,7 +26,7 @@ def test_retrieving_duals(solver):
     assert m.max_AB.dual == approx(0.1, **get_tol(solver))
     assert m.extra_slack_constraint.dual == approx(0, **get_tol(solver))
 
-    if solver == "gurobi":
+    if solver.name == "gurobi":
         assert m.max_AB.attr.slack == approx(0, **get_tol(solver))
         assert m.extra_slack_constraint.attr.slack == approx(50, **get_tol(solver))
         assert m.A.attr.RC == approx(0, **get_tol(solver))
@@ -63,7 +63,7 @@ def test_retrieving_duals_vectorized(solver):
         **get_tol_pl(solver),
     )
 
-    if solver == "gurobi":
+    if solver.name == "gurobi":
         assert_frame_equal(
             m.max_AB.attr.slack,
             pl.DataFrame({"c": [1, 2], "slack": [0, 50]}),
@@ -104,7 +104,7 @@ def test_support_variable_attributes(solver):
         **get_tol_pl(solver),
     )
 
-    if solver == "gurobi":
+    if solver.name == "gurobi":
         assert_frame_equal(
             m.X.attr.RC,
             pl.DataFrame({"t": [1, 2], "RC": [0.0, 1.9]}),
@@ -154,7 +154,7 @@ def test_support_variable_raw_attributes(solver):
         **get_tol_pl(solver),
     )
 
-    if solver == "gurobi":
+    if solver.name == "gurobi":
         assert_frame_equal(
             m.X.attr.RC,
             pl.DataFrame({"t": [1, 2], "RC": [0.0, 1.9]}),