commit cc71c3cac82ddf8bd23f9a710b0e332f403d9b41
author George Keishing <gkeishin@in.ibm.com> Wed Sep 20 09:38:03 2017 -0500
committer George Keishing <gkeishin@in.ibm.com> Wed Sep 27 06:45:42 2017 +0000
tree a050c6495800986e5387d2f2fbbfe122e442d8c8
parent ebfb66267e8bc579420a6bfd3c848a46484298ed

Update error log and association test for log deletion

Resolve  openbmc/openbmc-test-automation#990

Change-Id: I1be65814bb30f933fc7f041344c4f9eae8b09987
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

lib/utils.robot

diff --git a/lib/utils.robot b/lib/utils.robot
index 6a9e349..cf5ee7b 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -1091,7 +1091,7 @@
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
 
 
-Delete All Error Log
+Delete All Error Logs
     [Documentation]  Delete all error log entries using "DeleteAll" interface.
 
     ${data}=  Create Dictionary  data=@{EMPTY}

tests/test_association.robot

diff --git a/tests/test_association.robot b/tests/test_association.robot
index 0b33627..3af55ea 100755
--- a/tests/test_association.robot
+++ b/tests/test_association.robot
@@ -188,7 +188,7 @@
     [Documentation]  Set the "Resolved" error log and verify callout is deleted
     [Tags]  Set_Resolved_Field_And_Verify_Callout_Deletion
 
-    Delete Error logs
+    Delete All Error Logs
     Create Test Error With Callout
     ${elog_entry}=  Get URL List  ${BMC_LOGGING_ENTRY}
     ${resp}=  OpenBMC Get Request  ${elog_entry[0]}
@@ -271,7 +271,7 @@
    REST Power On
    ${status}=  Run Keyword And Return Status  Callout Test Binary Exist
    Run Keyword If  ${status} == ${False}  Install Tarball
-   Delete Error Logs
+   Delete All Error Logs
 
 
 Install Tarball

tests/test_error_log.robot

diff --git a/tests/test_error_log.robot b/tests/test_error_log.robot
index 701a5c1..ee0deba 100644
--- a/tests/test_error_log.robot
+++ b/tests/test_error_log.robot
@@ -90,7 +90,7 @@
 
     Create Test Error Log
     Verify Test Error Log
-    Delete Error Logs
+    Delete All Error Logs
     Execute Command On BMC
     ...  systemctl restart xyz.openbmc_project.Logging.service
     Sleep  10s  reason=Wait for logging service to restart properly.
@@ -136,7 +136,7 @@
     # In this test context we are making sure "Resolved" field is "0"
     # by default.
 
-    Delete Error Logs
+    Delete All Error Logs
     Create Test Error Log
     ${elog_entry}=  Get URL List  ${BMC_LOGGING_ENTRY}
     ${resolved}=  Read Attribute  ${elog_entry[0]}  Resolved
@@ -171,7 +171,7 @@
     #    "associations": []
     # },
 
-    Delete Error Logs
+    Delete All Error Logs
     Create Test Error Log
     Create Test Error Log
     # The error log generated is associated with the epoc time and unique
@@ -232,7 +232,7 @@
     REST Power On
 
     # Clear errors if there are any.
-    Delete Error Logs
+    Delete All Error Logs
 
     Trigger Host Watchdog Error
 
@@ -438,7 +438,7 @@
 Delete Error Logs And Verify
     [Documentation]  Delete all error logs and verify.
 
-    Delete Error Logs
+    Delete All Error Logs
     ${resp}=  OpenBMC Get Request  ${BMC_LOGGING_ENTRY}/list  quiet=${1}
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_NOT_FOUND}
 
@@ -467,5 +467,5 @@
    # 4. Clear all REST sessions.
 
    FFDC On Test Case Fail
-   Delete Error Logs
+   Delete All Error Logs
    Close All Connections