Remove old entries from .transport.testing.MARK

Author: khaeru

message_ix_models/model/transport/testing.py

@@ -41,25 +41,12 @@
         ),
         3: pytest.mark.xfail(raises=ValueError, reason="Missing ISR/mer-to-ppp.csv"),
         4: pytest.mark.xfail(reason="Currently unsupported"),
-        # Tests that fail with data that cannot be migrated from message_data
         7: pytest.mark.xfail(
             condition=GHA and platform.system() == "Darwin" and not HAS_GRAPHVIZ,
             reason="Graphviz missing on macos-13 GitHub Actions runners",
         ),
         9: pytest.mark.xfail(reason="Missing R14 input data/config"),
         10: pytest.mark.usefixtures("iea_eweb_test_data", "ssp_user_data"),
-        "gh-288": pytest.mark.xfail(
-            reason="Temporary, for https://github.com/iiasa/message-ix-models/pull/288",
-        ),
-        "gh-337": pytest.mark.xfail(
-            reason="Temporary, for https://github.com/iiasa/message-ix-models/pull/337."
-            " These tests fail as a result of "
-            "https://github.com/iiasa/message_ix/pull/924 and require updates to "
-            "constraint parameter values."
-        ),
-        "gh-339": pytest.mark.xfail(
-            reason="Temporary, for https://github.com/iiasa/message-ix-models/pull/339."
-        ),
     },
     testing.MARK,
 )

message_ix_models/tests/model/transport/test_build.py

@@ -298,7 +298,7 @@ def N_node(request) -> int:
         param("R11", "B", False, "IKARUS", False, marks=[mark.slow, MARK[1]]),
         param("R11", "B", False, "IKARUS", True, marks=[mark.slow, MARK[1]]),
         # R12, B
-        param("R12", "B", False, "IKARUS", True, marks=MARK["gh-337"]),
+        ("R12", "B", False, "IKARUS", True),
         # R14, A
         param(
             "R14",

message_ix_models/tests/model/transport/test_report.py

@@ -116,7 +116,7 @@ def test_debug(
     "regions, years",
     (
         param("R11", "A", marks=make_mark[2](ValueError)),
-        param("R12", "B", marks=MARK["gh-337"]),
+        ("R12", "B"),
         param("R14", "A", marks=MARK[9]),
         param("ISR", "A", marks=MARK[3]),
     ),
@@ -167,7 +167,7 @@ def quiet_genno(caplog):
 @mark.parametrize(
     "build",
     (
-        pytest.param(True, marks=MARK["gh-339"]),  # Run .transport.build.main()
+        True,  # Run .transport.build.main()
         False,  # Use data from an Excel export
     ),
 )
@@ -201,7 +201,6 @@ def test_simulated_solution(request, test_context, build, regions="R12", years="
 
 
 @build.get_computer.minimum_version
-@MARK["gh-339"]
 @mark.usefixtures("quiet_genno")
 @pytest.mark.parametrize(
     "plot_name",