Skip to content

Commit b648101

Browse files
committed
check for empty list wit ETH variables
These are lists, not single variables, so should not be compared against ${EMPTY} or ''. Also, set the default variables to empty lists, rather than TBD string. Signed-off-by: Maciej Pijanowski <[email protected]>
1 parent 064d056 commit b648101

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

dasharo-compatibility/check-ethernet-ports-order.robot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Default Tags automated
2323
SPS001.001 Ethernet ports are in order
2424
[Documentation] This test automates the verification of port order based
2525
... on PCIe bus numbers and checks PCIe switching.
26-
Skip If '''${ETH_PORTS}''' == '' not supported
26+
Depends On '${ETH_PORTS}' != '@{EMPTY}' not supported
2727
Power On
2828
Boot System Or From Connected Disk ${ENV_ID_UBUNTU}
2929
Login To Linux

dasharo-compatibility/network-speed.robot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ ETHPERF001.201 Check Performance of 2.5G Wired Network Interface (Ubuntu)
2929
...
3030
... Previous IDs: ETHPERF001.001
3131
[Tags] semiauto
32-
Depends On ${ETH_PERF_PAIR_2_G}
33-
Depends On ${ETH_PORTS}
32+
Depends On '${ETH_PERF_PAIR_2_G}' != '@{EMPTY}'
33+
Depends On '${ETH_PORTS}' != '@{EMPTY}'
3434

3535
${eth_ports_number}= Get Length ${ETH_PORTS}
3636
IF '${eth_ports_number}' == '2'
@@ -81,7 +81,7 @@ ETHPERF002.201 Check Performance of 10G Wired Network Interface (Ubuntu)
8181
...
8282
... Previous IDs: ETHPERF002.001
8383
[Tags] automated
84-
Depends On ${ETH_PERF_PAIR_10_G}
84+
Depends On '${ETH_PERF_PAIR_10_G}' != '@{EMPTY}'
8585
Power On
8686
Boot System Or From Connected Disk ${ENV_ID_UBUNTU}
8787
Login To Linux

lib/framework.robot

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ Depends On Variable
88
Depends On
99
[Documentation] Skips test if ``condition`` is not met. Test identifier
1010
... (first word of its name) and optional ``reason`` is set
11-
... to the test as per ```Skip`` keyword.
11+
... to the test as per ``Skip`` keyword.
1212
[Arguments] ${condition} ${reason}=${NONE}
1313
${line}= Set Variable ${TEST_NAME.split()}[0] not supported
14-
IF """${reason}""" != """${NONE}"""
14+
IF "${reason}" != "${NONE}"
1515
${line}= Set Variable ${line}: ${reason}
1616
END
17-
Skip If not ${condition} ${line}
17+
${should_skip}= Evaluate not bool(${condition})
18+
Skip If ${should_skip} ${line}

platform-configs/include/default.robot

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,12 @@ ${USE_ANSIBLE}= ${TRUE}
296296
${TESTS_IN_XCP_NG_SUPPORT}= ${FALSE}
297297
${TESTS_IN_ESXI_SUPPORT}= ${FALSE}
298298

299+
@{ETH_PERF_PAIR_10_G}= @{EMPTY}
300+
@{ETH_PERF_PAIR_1_G}= @{EMPTY}
301+
@{ETH_PERF_PAIR_2_G}= @{EMPTY}
302+
@{ETH_PORTS}= @{EMPTY}
303+
@{ETH_SFP_PORTS}= @{EMPTY}
304+
299305
# These were missing in default.robot and have been automatically
300306
# identified and added via: ./scripts/ci/check_platform_configs_vars.py
301307

@@ -384,11 +390,6 @@ ${WIN_SEQ_WRITE_QUEUED}= ${TBD}
384390
${ZIP_MULTI_COMPRESSION}= ${TBD}
385391
${ZIP_MULTI_DECOMPRESSION}= ${TBD}
386392
${FAN_RPM_MEASUREMENT_SENSOR_MODULE}= ${TBD}
387-
@{ETH_PERF_PAIR_10_G}= ${TBD}
388-
@{ETH_PERF_PAIR_1_G}= ${TBD}
389-
@{ETH_PERF_PAIR_2_G}= ${TBD}
390-
@{ETH_PORTS}= ${TBD}
391-
@{ETH_SFP_PORTS}= ${TBD}
392393

393394

394395
*** Keywords ***

0 commit comments

Comments
 (0)