mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-19 23:11:44 +01:00
Revert "drop stage-level vars" (#9647)
Revert "drop stage-level vars (#9556)"
This reverts commit 358c5e0c39.
This commit is contained in:
@@ -9,6 +9,7 @@ import pytest
|
||||
from dvc.parsing import ResolveError
|
||||
from dvc.parsing.context import Context
|
||||
from dvc.parsing.interpolate import embrace
|
||||
from dvc.utils.humanize import join
|
||||
|
||||
from . import make_entry_definition, make_foreach_def
|
||||
|
||||
@@ -21,6 +22,18 @@ def escape_ansi(line):
|
||||
# Tests for the interpolated entries
|
||||
|
||||
|
||||
@pytest.mark.parametrize("vars_", ["${file}_params.yaml", {"foo": "${foo}"}])
|
||||
def test_vars_interpolation_errors(tmp_dir, dvc, vars_):
|
||||
definition = make_entry_definition(tmp_dir, "build", {"vars": [vars_]})
|
||||
with pytest.raises(ResolveError) as exc_info:
|
||||
definition.resolve()
|
||||
|
||||
assert (
|
||||
str(exc_info.value) == "failed to parse 'stages.build.vars' in 'dvc.yaml': "
|
||||
"interpolating is not allowed"
|
||||
)
|
||||
|
||||
|
||||
def test_failed_to_interpolate(tmp_dir, dvc):
|
||||
context = Context(models={"foo": "bar"})
|
||||
definition = make_entry_definition(
|
||||
@@ -41,6 +54,23 @@ def test_failed_to_interpolate(tmp_dir, dvc):
|
||||
assert definition.context == {"models": {"foo": "bar"}}
|
||||
|
||||
|
||||
def test_local_vars_params_file_not_exist(tmp_dir, dvc):
|
||||
definition = make_entry_definition(
|
||||
tmp_dir,
|
||||
"build",
|
||||
{"vars": ["not_existing_params.yaml"], "cmd": "echo ${models.foo}"},
|
||||
)
|
||||
|
||||
with pytest.raises(ResolveError) as exc_info:
|
||||
definition.resolve()
|
||||
|
||||
assert (
|
||||
str(exc_info.value) == "failed to parse stage 'build' in 'dvc.yaml': "
|
||||
"'not_existing_params.yaml' does not exist"
|
||||
)
|
||||
assert not definition.context
|
||||
|
||||
|
||||
def test_specified_key_does_not_exist(tmp_dir, dvc):
|
||||
definition = make_entry_definition(
|
||||
tmp_dir,
|
||||
@@ -119,6 +149,25 @@ def test_interpolate_nested_iterable(tmp_dir, dvc):
|
||||
)
|
||||
|
||||
|
||||
def test_partial_vars_doesnot_exist(tmp_dir, dvc):
|
||||
(tmp_dir / "test_params.yaml").dump({"sub1": "sub1", "sub2": "sub2"})
|
||||
|
||||
definition = make_entry_definition(
|
||||
tmp_dir,
|
||||
"build",
|
||||
{"vars": ["test_params.yaml:sub3"], "cmd": "echo ${sub1} ${sub2}"},
|
||||
)
|
||||
|
||||
with pytest.raises(ResolveError) as exc_info:
|
||||
definition.resolve()
|
||||
|
||||
assert (
|
||||
str(exc_info.value) == "failed to parse stage 'build' in 'dvc.yaml': "
|
||||
"could not find 'sub3' in 'test_params.yaml'"
|
||||
)
|
||||
assert not definition.context
|
||||
|
||||
|
||||
# Tests foreach generated stages and their error messages
|
||||
|
||||
|
||||
@@ -235,6 +284,47 @@ def test_foreach_do_definition_item_does_not_exist(tmp_dir, dvc, key, loc):
|
||||
assert context == {"foo": "bar"}
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
"redefine",
|
||||
[
|
||||
{"item": 5},
|
||||
{"key": 5},
|
||||
{"item": 5, "key": 10},
|
||||
{"item": {"epochs": 10}},
|
||||
],
|
||||
)
|
||||
@pytest.mark.parametrize("from_file", [True, False])
|
||||
def test_item_key_in_generated_stage_vars(tmp_dir, dvc, redefine, from_file):
|
||||
context = Context(foo="bar")
|
||||
vars_ = [redefine]
|
||||
if from_file:
|
||||
(tmp_dir / "test_params.yaml").dump(redefine)
|
||||
vars_ = ["test_params.yaml"]
|
||||
|
||||
definition = make_foreach_def(
|
||||
tmp_dir,
|
||||
"build",
|
||||
{"model1": {"thresh": "10"}, "model2": {"thresh": 5}},
|
||||
{"vars": vars_, "cmd": "${item}"},
|
||||
context,
|
||||
)
|
||||
|
||||
with pytest.raises(ResolveError) as exc_info:
|
||||
definition.resolve_all()
|
||||
|
||||
message = str(exc_info.value)
|
||||
assert (
|
||||
"failed to parse stage 'build@model1' in 'dvc.yaml': "
|
||||
"attempted to modify reserved" in message
|
||||
)
|
||||
|
||||
key_or_keys = "keys" if len(redefine) > 1 else "key"
|
||||
assert f"{key_or_keys} {join(redefine)}" in message
|
||||
if from_file:
|
||||
assert "in 'test_params.yaml'" in message
|
||||
assert context == {"foo": "bar"}
|
||||
|
||||
|
||||
def test_foreach_wdir_key_does_not_exist(tmp_dir, dvc):
|
||||
definition = make_foreach_def(
|
||||
tmp_dir,
|
||||
|
||||
Reference in New Issue
Block a user