Update BMC reset test verification
Changes:
- Remove tests/test_bmc_reboot.robot file
- Update the same logic to test_managers_bmc.robot file
Change-Id: I9639eefc458068ba6f19adbd828b0d0087f53227
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/redfish/managers/test_managers_bmc.robot b/redfish/managers/test_managers_bmc.robot
index 979333a..fa32133 100644
--- a/redfish/managers/test_managers_bmc.robot
+++ b/redfish/managers/test_managers_bmc.robot
@@ -10,6 +10,14 @@
Test Setup Test Setup Execution
Test Teardown Test Teardown Execution
+
+*** Variables ***
+
+${SYSTEM_SHUTDOWN_TIME} ${5}
+
+# Strings to check from journald.
+${REBOOT_REGEX} ^\-- Reboot --
+
*** Test Cases ***
Verify Redfish BMC Firmware Version
@@ -60,8 +68,17 @@
# "target": "/redfish/v1/Managers/bmc/Actions/Manager.Reset"
# }
+ ${test_file_path}= Set Variable /tmp/before_bmcreboot
+ BMC Execute Command touch ${test_file_path}
+
Redfish OBMC Reboot (off)
+ BMC Execute Command if [ -f ${test_file_path} ] ; then false ; fi
+ Verify BMC RTC And UTC Time Drift
+
+ # Check for journald persistency post reboot.
+ Check For Regex In Journald ${REBOOT_REGEX} error_check=${1}
+
Redfish BMC Manager GracefulRestart When Host Booted
[Documentation] BMC graceful restart when host is running.
diff --git a/tests/test_bmc_reboot.robot b/tests/test_bmc_reboot.robot
deleted file mode 100644
index 79fbb9a..0000000
--- a/tests/test_bmc_reboot.robot
+++ /dev/null
@@ -1,40 +0,0 @@
-*** Settings ***
-Documentation Verify BMC reboot using REST.
-
-Resource ../lib/rest_client.robot
-Resource ../lib/utils.robot
-Resource ../lib/connection_client.robot
-Resource ../lib/openbmc_ffdc.robot
-Resource ../lib/boot_utils.robot
-Library ../lib/bmc_ssh_utils.py
-
-Force Tags bmcreboot
-
-Suite Setup Open Connection And Log In
-Suite Teardown Close All Connections
-Test Teardown FFDC On Test Case Fail
-
-*** Variables ***
-${SYSTEM_SHUTDOWN_TIME} ${5}
-
-# Strings to check from journald.
-${REBOOT_REGEX} ^\-- Reboot --
-
-
-*** Test Cases ***
-
-Test BMC Reboot via REST
- [Documentation] This test case is to verify bmc reboot using REST.
- [Tags] Test_BMC_Reboot_via_REST
-
- ${test_file_path}= Set Variable /tmp/before_bmcreboot
- BMC Execute Command touch ${test_file_path}
-
- REST OBMC Reboot (off) stack_mode=normal
-
- BMC Execute Command if [ -f ${test_file_path} ] ; then false ; fi
- Verify BMC RTC And UTC Time Drift
-
- # Check for journald persistency post reboot.
- Check For Regex In Journald ${REBOOT_REGEX} error_check=${1}
-