Fix deprecated keyword used in test suites
Changes:
- Run KeyWord If is deprecated since Robot
Framework version 5.*, use 'IF' instead
- Keyword name Check If BMC is Up does not
follow case convention
Tested:
- Checked using robot dry-run to make sure the
syntax is not broken
Change-Id: I3ab23d14b1b18ef409cfc469af68fe7368391c68
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/oem/nuvoton/test_ipmi_flash.robot b/oem/nuvoton/test_ipmi_flash.robot
index 8774aad..b8fbf8c 100644
--- a/oem/nuvoton/test_ipmi_flash.robot
+++ b/oem/nuvoton/test_ipmi_flash.robot
@@ -8,7 +8,7 @@
Suite Setup Suite Setup Execution
-Test Tags IPMI_Flash
+Test Tags IPMI_Flash
*** Variables ***
@@ -26,7 +26,7 @@
[Documentation] Test BIOS firmware update over IPMI.
[Tags] Test_BIOS_Firmware_Update
- Run Keyword Wait For Host To Ping ${OS_HOST} 3 mins
+ Wait For Host To Ping ${OS_HOST} 3 mins
Get LPC SHM Address
Update BIOS Firmware ${IMAGE_HOST_FILE_PATH_0}
@@ -89,8 +89,7 @@
${os_state}= Get Host State Attribute OperatingSystemState
Rprint Vars os_state
- Run Keyword if '${OS_BOOT_COMPLETE}' != '${os_state}'
- ... Redfish Power On
+ IF '${OS_BOOT_COMPLETE}' != '${os_state}' Redfish Power On
# generate bad image for test
${cmd}= Catenate dd if=/dev/urandom of=${HOST_WORK_DIR}/${BAD_IMG} bs=1K count=4
@@ -233,5 +232,5 @@
Should Not Contain ${stderr} Exception received
Sleep 10s
- Check If BMC is Up 20 min 20 sec
+ Check If BMC Is Up 20 min 20 sec
Wait For BMC Ready
diff --git a/oem/nuvoton/test_jtag_master.robot b/oem/nuvoton/test_jtag_master.robot
index d10fab2..ec00904 100644
--- a/oem/nuvoton/test_jtag_master.robot
+++ b/oem/nuvoton/test_jtag_master.robot
@@ -88,16 +88,20 @@
Set Suite Variable ${power_cycle_cmd}
Get File From SFTP Server ${readid_svf}
- Run KeyWord If ${program_cpld} == 1 Get File From SFTP Server ${readusercode_svf}
- Run KeyWord If ${program_cpld} == 1 Get File From SFTP Server ${cpld_firmware1}
- Run KeyWord If ${program_cpld} == 1 Get File From SFTP Server ${cpld_firmware2}
+ IF ${program_cpld} == 1
+ Get File From SFTP Server ${readusercode_svf}
+ Get File From SFTP Server ${cpld_firmware1}
+ Get File From SFTP Server ${cpld_firmware2}
+ END
scp.Open connection ${OPENBMC_HOST} username=${OPENBMC_USERNAME}
... password=${OPENBMC_PASSWORD}
Put File To BMC ${readid_svf}
- Run KeyWord If ${program_cpld} == 1 Put File To BMC ${readusercode_svf}
- Run KeyWord If ${program_cpld} == 1 Put File To BMC ${cpld_firmware1}
- Run KeyWord If ${program_cpld} == 1 Put File To BMC ${cpld_firmware2}
+ IF ${program_cpld} == 1
+ Put File To BMC ${readusercode_svf}
+ Put File To BMC ${cpld_firmware1}
+ Put File To BMC ${cpld_firmware2}
+ END
Sleep 5s
scp.Close Connection