Update tests for #213

message_ix_models/model/transport/testing.py

@@ -24,7 +24,8 @@
 
 log = logging.getLogger(__name__)
 
-# Common marks for transport code
+# Common marks for transport code. Do not reuse keys that are less than the highest key
+# appearing in the dict.
 MARK = {
     0: pytest.mark.xfail(
         reason="Missing R14 input data/assumptions", raises=FileNotFoundError
@@ -41,9 +42,6 @@
     5: lambda f: pytest.mark.xfail(
         raises=FileNotFoundError, reason=f"Requires non-public data ({f})"
     ),
-    6: pytest.mark.xfail(
-        reason="Temporary, for https://github.com/iiasa/message-ix-models/pull/207"
-    ),
     7: pytest.mark.xfail(
         condition=testing.GHA and platform.system() == "Darwin" and not HAS_GRAPHVIZ,
         reason="Graphviz missing on macos-13 GitHub Actions runners",

message_ix_models/tests/model/transport/test_build.py

@@ -171,7 +171,7 @@ def test_build_existing(tmp_path, test_context, url, solve=False):
     ],
 )
 def test_debug(test_context, tmp_path, regions, years, N_node, options):
-    """Exogenous demand calculation succeeds."""
+    """Debug particular calculations in the transport build process."""
     c, info = configure_build(
         test_context, tmp_path=tmp_path, regions=regions, years=years, options=options
     )
@@ -184,6 +184,9 @@ def test_debug(test_context, tmp_path, regions, years, N_node, options):
         # ("constraints::ixmp+transport+non-ldv", None),
         # ("energy:flow-n-product:trn other+1", "TJ"),
         # ("transport other::ixmp", None),
+        # ("sales fraction:n-t-y:ldv", None),
+        # ("load factor ldv:n-y", None),
+        # ("ldv hnc::ixmp", None),
     ):
         print(f"\n\n-- {key} --\n\n")
         print(c.describe(key))

message_ix_models/tests/model/transport/test_disutility.py

@@ -3,7 +3,6 @@
 from message_ix_models.model.transport import testing
 
 
-@testing.MARK[6]
 def test_disutility(
     caplog, tmp_path, test_context, regions="R12", years="B", options={}
 ):
@@ -32,4 +31,4 @@ def test_disutility(
     # Data are added to the scenario
     N = 12 * 27 * 12 * 14  # n × cg × t × y
     with assert_logs(caplog, f"{N} rows in 'input'"):
-        c.get("add message_data.model.transport.disutility")
+        c.get("add message_ix_models.model.transport.disutility")

message_ix_models/tests/model/transport/test_report.py

@@ -1,11 +1,9 @@
 import logging
 from copy import deepcopy
-from importlib.metadata import version
 from typing import TYPE_CHECKING
 
 import genno
 import pytest
-from packaging.version import parse
 from pytest import mark, param
 
 from message_ix_models import ScenarioInfo
@@ -24,7 +22,6 @@
 log = logging.getLogger(__name__)
 
 
-@MARK[6]
 def test_configure_legacy():
     from message_ix_models.report.legacy.default_tables import TECHS
 
@@ -57,7 +54,7 @@ def test_configure_legacy():
 @pytest.mark.parametrize(
     "regions, years",
     (
-        param("R11", "A", marks=MARK[1]),
+        param("R11", "A", marks=MARK[2](ValueError)),
         ("R12", "A"),
         param("R14", "A", marks=MARK[2](genno.ComputationError)),
         param("ISR", "A", marks=MARK[3]),
@@ -150,11 +147,11 @@ def test_plot_simulated(request, test_context, plot_name, regions="R12", years="
 
 
 @sim.to_simulate.minimum_version
-@pytest.mark.xfail(
-    raises=AssertionError,
-    reason="Temporary, for #549",
-    condition=parse(version("message_ix")) >= parse("3.8.0"),
-)
+# @pytest.mark.xfail(
+#     raises=AssertionError,
+#     reason="Temporary, for #549",
+#     condition=parse(version("message_ix")) >= parse("3.8.0"),
+# )
 @pytest.mark.usefixtures("preserve_report_callbacks")
 def test_iamc_simulated(
     request, tmp_path_factory, test_context, regions="R12", years="B"