Update tests for #259

- Set units for 'output' param in .ldv.prepare_tech_econ().
- .transport.files.population_suburb_share is required.

Author: khaeru

message_ix_models/model/transport/files.py

@@ -559,7 +559,6 @@ def read_structures() -> "sdmx.message.StructureMessage":
     key="population suburb share:n-y:exo",
     name="Share of MSA population that is suburban",
     units="dimensionless",
-    required=False,
 )
 
 speed = add(

message_ix_models/model/transport/ldv.py

@@ -299,7 +299,7 @@ def prepare_tech_econ(
 
     # Create base quantity for "output" parameter
     nty = tuple("nty")
-    c.add(k.output[0] * nty, wildcard(1.0, "", nty))
+    c.add(k.output[0] * nty, wildcard(1.0, "Gv km", nty))
     for i, coords in enumerate(["n::ex world", "t::LDV", "y::model"]):
         c.add(
             k.output[i + 1] * nty,

message_ix_models/tests/model/transport/test_build.py

@@ -276,14 +276,14 @@ def test_build_existing(tmp_path, test_context, url, solve=False):
 @pytest.mark.parametrize(
     "build_kw",
     (
-        dict(regions="R11", years="A", options=dict()),
-        dict(regions="R11", years="B", options=dict()),
+        dict(regions="R11", years="A"),
+        dict(regions="R11", years="B"),
         dict(regions="R11", years="B", options=dict(futures_scenario="A---")),
         dict(regions="R11", years="B", options=dict(futures_scenario="debug")),
-        dict(regions="R12", years="B", options=dict()),
+        dict(regions="R12", years="B"),
         dict(regions="R12", years="B", options=dict(navigate_scenario="act+ele+tec")),
-        dict(regions="R14", years="B", options=dict()),
-        param(dict(regions="ISR", years="A", options=dict()), marks=MARK[3]),
+        param(dict(regions="R14", years="B"), marks=MARK[0]),
+        param(dict(regions="ISR", years="A"), marks=MARK[3]),
     ),
 )
 def test_debug(

message_ix_models/tests/model/transport/test_data.py

@@ -2,7 +2,7 @@
 import pytest
 from iam_units import registry
 
-from message_ix_models.model.transport import build, testing
+from message_ix_models.model.transport import build, non_ldv, testing
 from message_ix_models.model.transport.CHN_IND import get_chn_ind_data, get_chn_ind_pop
 from message_ix_models.model.transport.roadmap import get_roadmap_data
 from message_ix_models.model.transport.testing import MARK, assert_units, make_mark
@@ -73,7 +73,7 @@ def test_get_non_ldv_data(test_context, regions, years="B"):
     c, _ = testing.configure_build(ctx, regions=regions, years=years)
 
     # Code runs
-    data = c.get("transport nonldv::ixmp")
+    data = c.get(f"transport{non_ldv.Pi}")
 
     # Data are provided for the these parameters
     exp_pars = {

message_ix_models/tests/model/transport/test_ldv.py

@@ -80,6 +80,9 @@ def test_get_ldv_data(tmp_path, test_context, dummy_LDV, regions, years) -> None
     )
 
     # Output data is returned and has the correct units
+    # for k, df_group in data["output"].groupby("unit"):
+    #     if k == "":  # DEBUG Show data with particular units
+    #         print(df_group.to_string())
     assert {"Gp km", "Gv km", "Gv * km", "km", "-"} >= set(
         data["output"]["unit"].unique()
     )

message_ix_models/tests/project/ssp/test_transport.py

@@ -152,7 +152,7 @@ def test_cli(tmp_path, mix_models_cli, input_xlsx_path) -> None:
     copyfile(input_file, path_in)
 
     # Code runs
-    result = mix_models_cli.invoke(["ssp", "transport", f"{path_in}"])
+    result = mix_models_cli.invoke(["ssp", "transport", "--method=A", f"{path_in}"])
     assert 0 == result.exit_code, result.output
 
     # Output path was determined automatically and exists