Temporarily xfail two transport tests for #281

Author: khaeru

message_ix_models/model/transport/testing.py

@@ -9,11 +9,12 @@
 
 import pytest
 from genno import Computer
-from message_ix import Reporter, Scenario
+from message_ix import ModelError, Reporter, Scenario
 
 import message_ix_models.report
-from message_ix_models import Context, ScenarioInfo, testing
+from message_ix_models import Context, ScenarioInfo
 from message_ix_models.report.sim import add_simulated_solution
+from message_ix_models.testing import GHA, bare_res
 from message_ix_models.util import silence_log
 from message_ix_models.util.graphviz import HAS_GRAPHVIZ
 
@@ -38,9 +39,13 @@
     4: pytest.mark.xfail(reason="Currently unsupported"),
     # Tests that fail with data that cannot be migrated from message_data
     7: pytest.mark.xfail(
-        condition=testing.GHA and platform.system() == "Darwin" and not HAS_GRAPHVIZ,
+        condition=GHA and platform.system() == "Darwin" and not HAS_GRAPHVIZ,
         reason="Graphviz missing on macos-13 GitHub Actions runners",
     ),
+    8: pytest.mark.xfail(
+        raises=ModelError,
+        reason="Temporary, for https://github.com/iiasa/message-ix-models/pull/281",
+    ),
 }
 
 make_mark: dict[int, Callable[..., pytest.MarkDecorator]] = {
@@ -104,7 +109,7 @@ def built_transport(
     options = options or dict()
 
     # Retrieve (maybe generate) the bare RES with the same settings
-    res = testing.bare_res(request, context, solved)
+    res = bare_res(request, context, solved)
 
     # Derive the name for the transport scenario
     model_name = res.model.replace("-GLOBIOM", "-Transport")

message_ix_models/tests/model/transport/test_build.py

@@ -62,7 +62,7 @@ def test_make_spec(regions_arg, regions_exp, years):
         param("R11", "B", False, "IKARUS", False, marks=[mark.slow, MARK[1]]),
         param("R11", "B", False, "IKARUS", True, marks=[mark.slow, MARK[1]]),
         # R12, B
-        ("R12", "B", False, "IKARUS", True),
+        param("R12", "B", False, "IKARUS", True, marks=MARK[8]),
         # R14, A
         param(
             "R14",

message_ix_models/tests/model/transport/test_report.py

@@ -60,7 +60,7 @@ def test_configure_legacy():
     "regions, years",
     (
         param("R11", "A", marks=make_mark[2](ValueError)),
-        ("R12", "A"),
+        param("R12", "A", marks=MARK[8]),
         param("R14", "A", marks=make_mark[2](genno.ComputationError)),
         param("ISR", "A", marks=MARK[3]),
     ),