Skip to content

Dynamic values #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TDL-EdgarsEglitis merged 3 commits into from
Jul 1, 2022
Merged

Dynamic values #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7c3b424
dynamic Environment/PreCases/AfterCases
Jun 29, 2022
57160b8
src_var fix & dynamic If_Case/Do_Case/Else_Case
Jun 29, 2022
e0225bd
ENV[] revert
Jul 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/core/case_runner.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def run(case_name, parent_params = {})
if steps["Precases"]
steps["Precases"].each do |pre_case|
begin
run(pre_case)
run(convert_value(pre_case))
rescue => e
log_warn("Pre-Case '#{pre_case}' Error: #{e.message}")
end
Expand All @@ -55,7 +55,7 @@ def run(case_name, parent_params = {})
if steps["Aftercases"]
steps["Aftercases"].each do |after_case|
begin
run(after_case)
run(convert_value(after_case))
rescue => e
log_warn("After Case '#{after_case}' Error: #{e.message}")
end
Expand All @@ -76,7 +76,7 @@ def run(case_name, parent_params = {})
if steps["Aftercases"]
steps["Aftercases"].each do |after_case|
begin
run(after_case)
run(convert_value(after_case))
rescue => e
log_warn("After Case '#{after_case}' Error: #{e.message}")
end
Expand Down
6 changes: 3 additions & 3 deletions lib/core/types_control_flow.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ def if_handler(action, _case)
if_succeeded = false
action["If_Cases"].each do |if_case|
raise "If_Case is not declared in group: #{if_case}" unless if_case.key?("If_Case")
if_case_name = if_case["If_Case"]
do_case_name = if_case.key?("Do_Case") ? if_case["Do_Case"] : nil
if_case_name = convert_value(if_case["If_Case"])
do_case_name = if_case.key?("Do_Case") ? convert_value(if_case["Do_Case"]) : nil
begin
run(if_case_name, get_parent_params(action))
if_succeeded = true
Expand All @@ -91,7 +91,7 @@ def if_handler(action, _case)
end
end
if !if_succeeded && action.key?("Else_Case") && !action["Else_Case"].nil?
else_case_name = action["Else_Case"]
else_case_name = convert_value(action["Else_Case"])
run(else_case_name, get_parent_params(action))
log_info("Finished case #{else_case_name}, resuming parent case #{_case}")
end
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/load.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ def load_case_file(filename)
########################################################

def load_env_and_vars(structure, setup_commands=true)
load_environment(structure["Environment"], setup_commands) if structure.key?("Environment")
load_environment(convert_value(structure["Environment"]), setup_commands) if structure.key?("Environment")
load_vars(structure)
end

Expand Down