Skip to content

Commit f677ddc

Browse files
committed
Remove Xfail marks from #281
1 parent 26b32e5 commit f677ddc

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

message_ix_models/model/transport/testing.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from typing import TYPE_CHECKING, Optional, Union
99

1010
import pytest
11-
from message_ix import ModelError, Reporter, Scenario
11+
from message_ix import Reporter, Scenario
1212

1313
import message_ix_models.report
1414
from message_ix_models import ScenarioInfo
@@ -44,10 +44,6 @@
4444
condition=GHA and platform.system() == "Darwin" and not HAS_GRAPHVIZ,
4545
reason="Graphviz missing on macos-13 GitHub Actions runners",
4646
),
47-
"gh-281": pytest.mark.xfail(
48-
raises=ModelError,
49-
reason="Temporary, for https://github.com/iiasa/message-ix-models/pull/281",
50-
),
5147
9: pytest.mark.xfail(reason="Missing R14 input data/config"),
5248
"gh-288": pytest.mark.xfail(
5349
reason="Temporary, for https://github.com/iiasa/message-ix-models/pull/288",

message_ix_models/tests/model/transport/test_build.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def test_make_spec(regions_arg, regions_exp, years):
9191
param("R11", "B", False, "IKARUS", False, marks=[mark.slow, MARK[1]]),
9292
param("R11", "B", False, "IKARUS", True, marks=[mark.slow, MARK[1]]),
9393
# R12, B
94-
param("R12", "B", False, "IKARUS", True, marks=MARK["gh-281"]),
94+
("R12", "B", False, "IKARUS", True),
9595
# R14, A
9696
param(
9797
"R14",

message_ix_models/tests/model/transport/test_report.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def test_configure_legacy():
5959
"regions, years",
6060
(
6161
param("R11", "A", marks=make_mark[2](ValueError)),
62-
param("R12", "B", marks=MARK["gh-281"]),
62+
("R12", "B"),
6363
param("R14", "A", marks=MARK[9]),
6464
param("ISR", "A", marks=MARK[3]),
6565
),

0 commit comments

Comments
 (0)