Merge pull request #10517 from danfengliu/click-out-infomation-popup-frame

Close scan plugin popup message to avoid interfereing logout operation

tests/apitests/python/test_scan_all_images.py

@@ -77,14 +77,14 @@ class TestProjects(unittest.TestCase):
         #Note: Please make sure that this Image has never been pulled before by any other cases,
         #          so it is a not-scanned image rigth after repository creation.
         #image = "tomcat"
-        image = "mariadb"
+        image = "haproxy"
         src_tag = "latest"
         #3.1 Push a image to project_Alice;
         TestProjects.repo_Alice_name, tag_Alice = push_image_to_project(project_Alice_name, harbor_server, user_Alice_name, user_common_password, image, src_tag)
 
         #Note: Please make sure that this Image has never been pulled before by any other cases,
         #          so it is a not-scanned image rigth after repository creation.
-        image = "mysql"
+        image = "memcached"
         src_tag = "latest"
         #3.2 push another image to project_Luca;
         TestProjects.repo_Luca_name, tag_Luca = push_image_to_project(project_Luca_name, harbor_server, user_Luca_name, user_common_password, image, src_tag)

tests/resources/Harbor-Pages/HomePage.robot

@@ -31,7 +31,8 @@ Sign In Harbor
     Retry Button Click  ${login_btn}
     Log To Console  ${user}
     Retry Wait Element  xpath=//span[contains(., '${user}')]
-    Run Keyword If  ${is_close_scan_plugin_mesg}==${true}  Run Keyword And Ignore Error  Retry Element Click  ${close_scan_plugin_mesg}
+    Click Element If Visible  ${close_scan_plugin_mesg}
+    #Run Keyword If  ${is_close_scan_plugin_mesg}==${true}  Run Keyword And Ignore Error  Retry Element Click  ${close_scan_plugin_mesg}
 
 Capture Screenshot And Source
     Capture Page Screenshot

tests/resources/Harbor-Pages/Project.robot

@@ -205,6 +205,7 @@ Go Into Repo
     \    Sleep  2
     Capture Page Screenshot
     Retry Double Keywords When Error  Retry Element Click  ${repo_name_element}  Retry Wait Until Page Not Contains Element  ${repo_name_element}
+    Capture Page Screenshot
     Retry Wait Element  ${tag_table_column_pull_command}
     Retry Wait Element  ${tag_images_btn}
     Capture Page Screenshot

tests/resources/Harbor-Pages/ToolKit.robot

@@ -74,6 +74,7 @@ Multi-delete Object
 Multi-delete User
     [Arguments]    @{obj}
     :For  ${obj}  in  @{obj}
+    \    Sleep  1
     \    Retry Element Click  //clr-dg-row[contains(.,'${obj}')]//label
     Retry Element Click  ${member_action_xpath}
     Retry Element Click  //*[@id='deleteUser']
@@ -83,6 +84,7 @@ Multi-delete User
 Multi-delete Member
     [Arguments]    @{obj}
     :For  ${obj}  in  @{obj}
+    \    Sleep  1
     \    Retry Element Click  //clr-dg-row[contains(.,'${obj}')]//clr-checkbox-wrapper/label
     Retry Double Keywords When Error  Retry Element Click  ${member_action_xpath}  Retry Wait Until Page Contains Element  ${delete_action_xpath}
     Retry Double Keywords When Error  Retry Element Click  ${delete_action_xpath}  Retry Wait Until Page Contains Element  ${delete_btn}

tests/resources/Util.robot

@@ -223,6 +223,14 @@ Command Should be Failed
     Should Not Be Equal As Strings  '${rc}'  '0'
     [Return]  ${output}
 
+Click Element If Visible
+    [Arguments]  ${elements}
+    :For  ${n}  IN RANGE  1  6
+    \    ${out}  Run Keyword And Ignore Error  Wait Until Page Contains Element  ${elements}
+    \    Exit For Loop If  '${out[0]}'=='FAIL'
+    \    Retry Element Click  ${elements}
+    Should Be Equal As Strings  '${out[0]}'  'FAIL'
+
 Retry Keyword When Error
     [Arguments]  ${keyword}  @{elements}
     :For  ${n}  IN RANGE  1  6