Adjust two tests for less-informative exceptions

…with Python 3.12 and JPype 1.5.0 only.

ixmp/tests/core/test_scenario.py

@@ -1,4 +1,5 @@
 import re
+import sys
 
 import numpy.testing as npt
 import pandas as pd
@@ -93,10 +94,15 @@ def test_from_url(self, mp, caplog):
         with pytest.raises(Exception, match=expected):
             scen, mp = ixmp.Scenario.from_url(url + "#10000", errors="raise")
 
-        # Giving an invalid scenario with errors='warn' raises an exception
+        # Giving an invalid scenario with errors='warn' causes a message to be logged
         msg = (
-            "ValueError: scenario='Hitchhikerfoo'\n"
-            f"when loading Scenario from url: {repr(url + 'foo')}"
+            "ValueError: "
+            + (
+                "scenario='Hitchhikerfoo'"
+                if sys.version_info.minor != 12
+                else "model, scenario, or version not found"
+            )
+            + f"\nwhen loading Scenario from url: {repr(url + 'foo')}"
         )
         with assert_logs(caplog, msg):
             scen, mp = ixmp.Scenario.from_url(url + "foo")

ixmp/tests/test_cli.py

@@ -1,4 +1,5 @@
 import re
+import sys
 from pathlib import Path
 
 import pandas as pd
@@ -403,7 +404,12 @@ def test_solve(ixmp_cli, test_mp):
     ]
     result = ixmp_cli.invoke(cmd)
     assert result.exit_code == 1, result.output
-    assert "Error: model='non-existing'" in result.output
+    exp = (
+        "='non-existing'"
+        if sys.version_info.minor != 12
+        else ", scenario, or version not found"
+    )
+    assert f"Error: model{exp}" in result.output
 
     result = ixmp_cli.invoke([f"--url=ixmp://{test_mp.name}/foo/bar", "solve"])
     assert UsageError.exit_code == result.exit_code, result.output