Adjust test marks for #225

iiasa · Dec 4, 2024 · b1cf6a4 · b1cf6a4
1 parent 8162acd
commit b1cf6a4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/message_ix_models/tests/model/transport/test_report.py b/message_ix_models/tests/model/transport/test_report.py
@@ -4,7 +4,6 @@
 
 import genno
 import pytest
-from message_ix import ModelError
 from pytest import mark, param
 
 from message_ix_models import ScenarioInfo
@@ -60,13 +59,7 @@ def test_configure_legacy():
     "regions, years",
     (
         param("R11", "A", marks=MARK[2](ValueError)),
-        param(
-            "R12",
-            "A",
-            marks=pytest.mark.xfail(
-                raises=ModelError, reason="Temporary, for message-ix-models#213"
-            ),
-        ),
+        ("R12", "A"),
         param("R14", "A", marks=MARK[2](genno.ComputationError)),
         param("ISR", "A", marks=MARK[3]),
     ),
@@ -132,7 +125,6 @@ def test_simulated_solution(request, test_context, regions="R12", years="B"):
     assert 0 < len(result)
 
 
-@pytest.mark.xfail(condition=GHA, reason="Temporary, for #213; fails on GitHub Actions")
 @build.get_computer.minimum_version
 @mark.usefixtures("quiet_genno")
 @pytest.mark.parametrize(

diff --git a/message_ix_models/tests/tools/iea/test_web.py b/message_ix_models/tests/tools/iea/test_web.py
@@ -90,13 +90,7 @@ def test_prepare_computer(self, test_context, source, source_kw):
             GHA or not HAS_MESSAGE_DATA, reason="No fuzzed version of this data"
         ),
     ),
-    pytest.param(
-        "IEA",
-        "2024",
-        marks=pytest.mark.xfail(
-            GHA or not HAS_MESSAGE_DATA, reason="No fuzzed version of this data"
-        ),
-    ),
+    ("IEA", "2024"),
     ("OECD", "2021"),
     ("OECD", "2022"),
     ("OECD", "2023"),