提交 1bfe043d 编写于 作者: aaronchen2k2k's avatar aaronchen2k2k

fix a bug, rollback the res and dir after jumping from nested yaml

上级 6f56eee3
......@@ -98,7 +98,7 @@ fields:
postfix: "\t"
- field: field_yaml # 引用其他的定义文件整体内容。
range: test/nested2.yaml{3} # 相对当前文件路径。
range: test/test-nested2.yaml{3} # 相对当前文件路径。
postfix: "\t"
- field: field_use_config # 引用其他的config定义文件。
......
......@@ -57,7 +57,7 @@ func CreateFieldValuesFromList(field *model.DefField, fieldValue *model.FieldWit
items = CreateValuesFromLiteral(field, desc, stepStr, repeat)
} else if typ == "interval" {
items = CreateValuesFromInterval(field, desc, stepStr, repeat)
} else if typ == "yaml" {
} else if typ == "yaml" { // load from a yaml
items = CreateValuesFromYaml(field, desc, stepStr, repeat)
field.ReferToAnotherYaml = true
}
......@@ -251,6 +251,9 @@ func CreateValuesFromInterval(field *model.DefField, desc, stepStr string, repea
func CreateValuesFromYaml(field *model.DefField, yamlFile, stepStr string, repeat int) (items []interface{}) {
// keep root def, since vari.Def will be overwrite by refer yaml file
rootDef := vari.Def
defaultDir := vari.DefaultDir
configDir := vari.ConfigDir
res := vari.Res
configFile := vari.ConfigDir + yamlFile
fieldsToExport := make([]string, 0) // set to empty to use all fields
......@@ -270,6 +273,9 @@ func CreateValuesFromYaml(field *model.DefField, yamlFile, stepStr string, repea
// rollback root def when finish to deal with refer yaml file
vari.Def = rootDef
vari.DefaultDir = defaultDir
vari.ConfigDir = configDir
vari.Res = res
return
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册