Remote logging fixes
Changes:
- Remove rsyslog service status check in test setup.
Reason being the new behaviour expects the service to be
down when remote logging service is configured to default.
- Update RSYSLOG_RETRY_REGEX.
- Update REST logging API enabled test code.
Change-Id: Ic65c514e3ecd374879ead095082d4ecf018f1ea2
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/remote_logging/test_remote_logging.robot b/remote_logging/test_remote_logging.robot
index 4c0fb90..27ba41d 100644
--- a/remote_logging/test_remote_logging.robot
+++ b/remote_logging/test_remote_logging.robot
@@ -26,7 +26,7 @@
${BMC_BOOT_MSG} Startup finished in
${BMC_SYSLOG_REGEX} dropbear|vrm-control.sh
${RSYSLOG_REGEX} start|exiting on signal 15|there are no active actions configured
-${RSYSLOG_RETRY_REGEX} suspended, next retry
+${RSYSLOG_RETRY_REGEX} suspended
*** Test Cases ***
@@ -86,11 +86,12 @@
Write Attribute ${BMC_LOGGING_URI}${/}rest_api_logs Enabled data=${log_dict}
... verify=${True} expected_value=${True}
+ Sleep 5s
+
+ Start Journal Log
Initialize OpenBMC
Log Out OpenBMC
-
- ${bmc_journald} ${stderr} ${rc}= BMC Execute Command
- ... journalctl --no-pager
+ ${bmc_journald}= Stop Journal Log
Should Contain ${bmc_journald} login json:None 200 OK
... msg=${bmc_journald} doesn't contains REST entries.
@@ -129,9 +130,6 @@
Verify Rsyslog Config On BMC
- Configure Remote Log Server With Parameters remote_host=${EMPTY} remote_port=0
- Verify Rsyslog Config On BMC remote_host=remote-host remote_port=port
-
Test Remote Logging Invalid Port Config And Verify BMC Journald
[Documentation] Test remote logging interface and configuration.
@@ -327,10 +325,6 @@
Run Keyword If ${config_status}==${FALSE}
... Configure Remote Log Server With Parameters
- ${ActiveState}= Get Service Attribute ActiveState rsyslog.service
- Should Be Equal active ${ActiveState}
- ... msg=rsyslog logging service not in active state.
-
Remote Logging Interface Should Exist
[Documentation] Check that the remote logging URI exist.
diff --git a/test_lists/skip_test_witherspoon b/test_lists/skip_test_witherspoon
index e17d148..6c2c5d9 100644
--- a/test_lists/skip_test_witherspoon
+++ b/test_lists/skip_test_witherspoon
@@ -77,3 +77,5 @@
-e Verify_Disabling_And_Enabling_IPMI_Via_Host
-e Verify_Disabling_IPMI_Via_OOB_IPMI
-e Verify_IPMI_Disable_Persistency_After_BMC_Reboot
+# Remote logging
+-e Verify_BMC_Journald_Contains_No_Credential_Data