commit d2fd32de2e4a4da1fd6043ff304d6108333687d9
author George Keishing <gkeishin@in.ibm.com> Thu Apr 07 11:19:01 2022 -0500
committer George Keishing <gkeishin@in.ibm.com> Fri Apr 08 09:48:26 2022 -0500
tree 42413fc6ad63a82fe11e7c5e31837c3af996192e
parent 0e13223f46bca24a3a1cddc09580547e9e43eaf3

Update password changed string check

Note: passwd response messages could be either as per latest

'passwd: password expiry information changed'. or 'passwd: password changed.'

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

security/test_bmc_expire_password.robot

diff --git a/security/test_bmc_expire_password.robot b/security/test_bmc_expire_password.robot
index f966b80..00b1c36 100644
--- a/security/test_bmc_expire_password.robot
+++ b/security/test_bmc_expire_password.robot
@@ -26,7 +26,7 @@
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
 
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     ${status}=  Run Keyword And Return Status   Run External IPMI Standard Command  lan print -v
     Should Be Equal  ${status}  ${False}
@@ -39,7 +39,7 @@
 
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     ${status}=  Run Keyword And Return Status
     ...  Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
@@ -55,7 +55,7 @@
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
 
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     Redfish.Login
     # Change to a valid password.
@@ -74,7 +74,7 @@
 
    Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
    ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-   Should Contain  ${output}  password expiry information changed
+   Should Contain Any  ${output}  password expiry information changed  password changed
 
    Redfish.Login
    ${status}=  Run Keyword And Return Status
@@ -93,7 +93,7 @@
    Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
 
    ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-   Should Contain  ${output}  password expiry information changed
+   Should Contain Any  ${output}  password expiry information changed  password changed
 
    Verify User Password Expired Using Redfish  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
    # Change to a valid password.
@@ -113,7 +113,7 @@
 
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     Verify User Password Expired Using Redfish  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     Redfish.Login
@@ -132,7 +132,7 @@
 
     Open Connection And Log In  ${OPENBMC_USERNAME}  ${OPENBMC_PASSWORD}
     ${output}  ${stderr}  ${rc}=  BMC Execute Command  passwd --expire ${OPENBMC_USERNAME}
-    Should Contain  ${output}  password expiry information changed
+    Should Contain Any  ${output}  password expiry information changed  password changed
 
     Wait Until Page Contains Element  ${xpath_root_button_menu}
     Click Element  ${xpath_root_button_menu}