Temporarily XFAIL one test for iiasa/ixmp#595

Author: khaeru

message_ix_models/testing/__init__.py

@@ -9,6 +9,8 @@
 import platform
 from collections.abc import Generator, Hashable
 from copy import deepcopy
+from importlib.metadata import version
+from importlib.util import find_spec
 from pathlib import Path
 from random import randbytes
 from tempfile import TemporaryDirectory
@@ -78,6 +80,13 @@
         condition=GHA,
         reason="https://github.com/iiasa/message-ix-models/issues/375",
     ),
+    "ixmp#595": pytest.mark.xfail(
+        condition=version("ixmp") > "3.11.0"
+        and find_spec("ixmp4") is not None
+        and version("ixmp4") >= "0.11.0",
+        reason="https://github.com/iiasa/ixmp#595",
+        # raises=ixmp4.core.exceptions.RunLockRequired,
+    ),
     "sdmx#230": pytest.mark.xfail(
         condition=GHA,
         reason="https://github.com/khaeru/sdmx/issues/230",

message_ix_models/tests/test_util.py

@@ -14,6 +14,7 @@
 from pandas.testing import assert_series_equal
 
 from message_ix_models import ScenarioInfo
+from message_ix_models.testing import MARK
 from message_ix_models.util import (
     MESSAGE_DATA_PATH,
     MESSAGE_MODELS_PATH,
@@ -281,6 +282,7 @@ def test_make_source_tech0():
         make_source_tech(info, _MST_COMMON, **values)
 
 
+@MARK["ixmp#595"]
 def test_make_source_tech1(test_mp):
     """Test make_source_tech() with a Scenario object as input."""
     s = Scenario(test_mp, model="model", scenario="scenario", version="new")