Changed (once again) the evaluation delimiters (<| and |>)

This commit is contained in:
2026-02-13 18:51:49 +01:00
parent a6058b9dd8
commit 899857767a
21 changed files with 71 additions and 70 deletions

View File

@@ -19,10 +19,10 @@
name: Check condition on existing variable (PASS)
key: $(test)_PASS
values:
- $| $(pfn_Dummy_int) > 1 |
- <| $(pfn_Dummy_int) > 1 |>
- check:
name: Check condition on existing variable (FAIL)
key: $(test)_FAIL
values:
- $| "tailor" in "$(pfn_Dummy_str)" |
- <| "tailor" in "$(pfn_Dummy_str)" |>

View File

@@ -16,17 +16,17 @@
- $(loop_param)
exit_condition:
value: $| $(pfn_Echo function) > 3 |
value: <| $(pfn_Echo function) > 3 |>
- let:
name: let
key: $(test)_PASS
values:
- conditional_exec: $| random.randint(1, 2) |
- conditional_exec: <| random.randint(1, 2) |>
- console:
name: Console creation
condition: $| $(conditional_exec) == 1 |
condition: <| $(conditional_exec) == 1 |>
console_name: consname
doc: Opening the console
key: $(test)_PASS
@@ -34,18 +34,19 @@
- open:
protocol: terminal
terminal_path: $(test_directory)
- writeln: echo "terminal loaded"
- console:
name: Console read_until with timeout
condition: $| $(conditional_exec) == 1 |
condition: <| $(conditional_exec) == 1 |>
console_name: consname
key: $(test)_PASS
steps:
- read_until: {expected: "$(terminal_prompt)", timeout: 10}
- read_until: {expected: terminal loaded, timeout: 5}
- console:
name: Console write
condition: $| $(conditional_exec) == 1 |
condition: <| $(conditional_exec) == 1 |>
console_name: consname
key: $(test)_PASS
steps:
@@ -53,12 +54,12 @@
- sleep:
name: sleep item
condition: $| $(conditional_exec) == 1 |
condition: <| $(conditional_exec) == 1 |>
timeout: 1
- console:
name: Console read_until immediate
condition: $| $(conditional_exec) == 1 |
condition: <| $(conditional_exec) == 1 |>
console_name: consname
key: $(test)_PASS
steps:
@@ -66,7 +67,7 @@
- console:
name: Console read_until immediate (2)
condition: $| $(conditional_exec) == 1 |
condition: <| $(conditional_exec) == 1 |>
console_name: consname
key: $(test)_PASS
steps:
@@ -74,7 +75,7 @@
- console:
name: Console closure
condition: $| $(conditional_exec) == 1 |
condition: <| $(conditional_exec) == 1 |>
console_name: consname
key: $(test)_PASS
steps:
@@ -82,5 +83,5 @@
- sleep:
name: sleep item
condition: $| $(conditional_exec) == 2 |
condition: <| $(conditional_exec) == 2 |>
timeout: 1

View File

@@ -138,7 +138,7 @@
- py_func:
name: Return True expect False but no_fail expansed
no_fail: $| bool(0) == False |
no_fail: <| bool(0) == False |>
key: $(test)_PASS
file: $(test_path)$(psep)results$(psep)results.py
func_name: echo
@@ -147,7 +147,7 @@
- py_func:
name: Return True expect False but no_fail expansed (must fail)
no_fail: $| bool(1) == False |
no_fail: <| bool(1) == False |>
key: $(test)_FAIL
file: $(test_path)$(psep)results$(psep)results.py
func_name: echo

View File

@@ -9,4 +9,4 @@ expanse_index_blo: 1
expanse_index: $(expanse_index_$(expanse_select))
expanse_table: $(expanse_table_$(expanse_select))
expanse_eval: $|$(expanse_index) == 1|
expanse_eval: <|$(expanse_index) == 1|>

View File

@@ -2,26 +2,26 @@
name: Check variables expansion is correct (PASS)
key: $(test)_PASS
values:
- $(expanse_index) == 1
- $(expanse_table)[$(expanse_index)] == 9012
- $(expanse_eval) == True
- <| $(expanse_index) == 1 |>
- <| $(expanse_table)[$(expanse_index)] == 9012 |>
- <| $(expanse_eval) == True |>
- let:
name: Dynamic variables expansion
key: $(test)_PASS
values:
- expanse_select: $|"$(expanse_select)".replace("o", "a")|
- expanse_select: <|"$(expanse_select)".replace("o", "a")|>
- expanse_index: $(expanse_index_$(expanse_select))
- expanse_table: $(expanse_table_$(expanse_select))
- expanse_eval: $|$(expanse_index) == 1|
- expanse_eval: <|$(expanse_index) == 1|>
- check:
name: Check variables expansion is correct (PASS)
key: $(test)_PASS
values:
- $(expanse_index) == 0
- $(expanse_table)[$(expanse_index)] == "abcd"
- $(expanse_eval) == False
- <| $(expanse_index) == 0 |>
- <| $(expanse_table)[$(expanse_index)] == "abcd" |>
- <| $(expanse_eval) == False |>
- let:
name: Complex variables expansion
@@ -33,13 +33,13 @@
- var4: blo
- expanse_var_bla: 3
- expanse_blo_var: 5
- expanse_complex: $|$|$(expanse_$(var2)_$(var3))*6| + $|4*$($(var1)_$(var4)_$(var2))||
- expanse_complex: <|<|$(expanse_$(var2)_$(var3))*6|> + <|4*$($(var1)_$(var4)_$(var2))|>|>
- check:
name: Check complex variables expansion is correct (PASS)
key: $(test)_PASS
values:
- $| $(expanse_complex) == 38 |
- <| $(expanse_complex) == 38 |>
- let:
name: Variables expansion in object
@@ -50,10 +50,10 @@
- expanse_var_2: 6
- expanse_object:
[
{ a: $(expanse_var_2), $(expanse_key): $|2**3| },
{ a: $(expanse_var_2), $(expanse_key): <|2**3|> },
{
'$|"bla".replace("a", "o")|':
[$|$(expanse_var)*$(expanse_var_2)|, 25],
'<|"bla".replace("a", "o")|>':
[<|$(expanse_var)*$(expanse_var_2)|>, 25],
},
]
@@ -61,4 +61,4 @@
name: Check complex variables expansion is correct (PASS)
key: $(test)_PASS
values:
- '$| $(expanse_object) == [{"a": 6, "b": 8}, {"blo": [18, 25]}] |'
- '<| $(expanse_object) == [{"a": 6, "b": 8}, {"blo": [18, 25]}] |>'

View File

@@ -13,7 +13,7 @@
- group:
name: jsonrpc tests
condition: $| '/jrpces' in r'''$(cn_json rpc echo server)''' |
condition: <| '/jrpces' in r'''$(cn_json rpc echo server)''' |>
steps:
- console:
name: Start the json rpc echo server

View File

@@ -12,7 +12,7 @@
name: Let it be
values:
it: $(loop_param)
be: $| $(loop_param) == $(it) |
be: <| $(loop_param) == $(it) |>
- loop:
name: Cycle iterating on list
@@ -30,7 +30,7 @@
name: Let it be
values:
- it: $(loop_param)
- be: $| $(loop_param) == $(it) |
- be: <| $(loop_param) == $(it) |>
- let:
name: Get time
@@ -44,7 +44,7 @@
name: Get parameter file value
key: $(test)_PASS
values:
- test_overwrite_me: $| $(overwrite_me) == True |
- test_overwrite_me: <| $(overwrite_me) == True |>
- py_func:
name: Check global dic pass
@@ -84,10 +84,10 @@
name: Evaluate Overwriting parameter file value
key: $(test)_PASS
values:
- test_overwrite_me: $| "$(overwrite_me)" == True |
- test_overwrite_me: <| "$(overwrite_me)" == True |>
- check:
name: Check Overwriting parameter file value
key: $(test)_PASS
values:
- $(test_overwrite_me) == False
- <| $(test_overwrite_me) == False |>

View File

@@ -13,14 +13,14 @@ main:
- let:
name: Set test variables for Linux
condition: $| "$(os)" == "Linux" |
condition: <| "$(os)" == "Linux" |>
values:
- terminal_prompt: $(linux_prompt)
- psep: "/"
- let:
name: Set test variables for Windows
condition: $| "$(os)" == "Windows" |
condition: <| "$(os)" == "Windows" |>
values:
- terminal_prompt: $(windows_prompt)
- psep: "\\"

View File

@@ -1,5 +1,5 @@
# All sub directory in items are evaluated as a list
items: $| [os.path.basename(f.path) for f in os.scandir(os.path.join(r"$(test_directory)", "items")) if f.is_dir()] |
items: <| [os.path.basename(f.path) for f in os.scandir(os.path.join(r"$(test_directory)", "items")) if f.is_dir()] |>
# - common
# - check
# - console