Refactor unstable test cases (#19350)

Fix #19282

Signed-off-by: Yang Jiao <[email protected]>

tests/resources/Harbor-Pages/Administration-Users.robot

@@ -25,7 +25,7 @@ Assign User Admin
     Input Text  xpath=//harbor-user//hbr-filter//input  ${user}
     Sleep  2
     #select checkbox
-    Retry Element Click  //clr-dg-row[contains(.,'${user}')]//label
+    Retry Element Click  //clr-dg-row[contains(.,'${user}')]//label[contains(@class,'clr-control-label')]
     #click assign admin
     Retry Element Click  //*[@id='set-admin']
     Sleep  1

tests/resources/Harbor-Pages/Configuration.robot

@@ -245,7 +245,7 @@ Create New Labels
 
 Update A Label
     [Arguments]  ${labelname}
-    Retry Element Click  xpath=//clr-dg-row[contains(.,'${labelname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label
+    Retry Element Click  xpath=//clr-dg-row[contains(.,'${labelname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')]
     Sleep  1
     Retry Element Click  xpath=//button[contains(.,'Edit')]
     Sleep  1
@@ -256,7 +256,7 @@ Update A Label
 
 Delete A Label
     [Arguments]  ${labelname}
-    Retry Element Click  xpath=//clr-dg-row[contains(.,'${labelname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label
+    Retry Element Click  xpath=//clr-dg-row[contains(.,'${labelname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')]
     Sleep  1
     Retry Element Click  xpath=//button[contains(.,'Delete')]
     Sleep  3
@@ -312,7 +312,7 @@ Set User Name Claim And Save
 
 Select Distribution
     [Arguments]    ${name}
-    Retry Element Click    //clr-dg-row[contains(.,'${name}')]//div[contains(@class,'clr-checkbox-wrapper')]/label
+    Retry Element Click    //clr-dg-row[contains(.,'${name}')]//div[contains(@class,'clr-checkbox-wrapper')]/label[contains(@class,'clr-control-label')]
 
 Distribution Exist
     [Arguments]  ${name}  ${endpoint}
@@ -349,7 +349,7 @@ Delete A Distribution
     ${is_exsit}    evaluate    not ${deletable}
     Switch To Distribution
     Filter Distribution List  ${name}  ${endpoint}
-    Retry Double Keywords When Error  Select Distribution   ${name}  Wait Until Element Is Visible  //clr-datagrid//clr-dg-footer//clr-checkbox-wrapper/label
+    Retry Double Keywords When Error  Select Distribution   ${name}  Wait Until Element Is Visible  //clr-datagrid//clr-dg-footer//clr-checkbox-wrapper/label[contains(@class,'clr-control-label')]
     Retry Double Keywords When Error  Retry Element Click  ${distribution_action_btn_id}  Wait Until Element Is Visible And Enabled  ${distribution_del_btn_id}
     Retry Double Keywords When Error  Retry Element Click  ${distribution_del_btn_id}  Wait Until Element Is Visible And Enabled  ${delete_confirm_btn}
     Retry Double Keywords When Error  Retry Element Click  ${delete_confirm_btn}  Retry Wait Until Page Not Contains Element  ${delete_confirm_btn}
@@ -359,7 +359,7 @@ Edit A Distribution
     [Arguments]    ${name}  ${endpoint}  ${new_endpoint}=${null}
     Switch To Distribution
     Filter Distribution List  ${name}  ${endpoint}
-    Retry Double Keywords When Error  Select Distribution   ${name}  Wait Until Element Is Visible  //clr-datagrid//clr-dg-footer//clr-checkbox-wrapper/label  times=9
+    Retry Double Keywords When Error  Select Distribution   ${name}  Wait Until Element Is Visible  //clr-datagrid//clr-dg-footer//clr-checkbox-wrapper/label[contains(@class,'clr-control-label')]  times=9
     Retry Double Keywords When Error  Retry Element Click  ${distribution_action_btn_id}  Wait Until Element Is Visible And Enabled  ${distribution_edit_btn_id}
     Retry Double Keywords When Error  Retry Element Click  ${distribution_edit_btn_id}  Wait Until Element Is Visible And Enabled  ${distribution_name_input_id}
     Retry Text Input  ${distribution_endpoint_id}  ${new_endpoint}

tests/resources/Harbor-Pages/Configuration_Elements.robot

@@ -35,9 +35,9 @@ ${configuration_system_wl_add_confirm_btn}    //*[@id='add-to-system']
 ${configuration_system_wl_delete_a_cve_id_icon}    //app-security//form/section//ul/li[1]/a[2]/clr-icon
 ${configuration_sys_repo_readonly_chb_id}  //*[@id='repo_read_only_lbl']
 ${cve_allowlist_expires_btn}  //clr-date-container[.//div[@class='clr-input-group' and not(@hidden)]]//button
-${cve_allowlist_expires_yesterday}  //td[.//button[@class='day-btn is-today']]/preceding-sibling::td[1]
-${cve_allowlist_expires_tomorrow}  //td[.//button[@class='day-btn is-today']]/following-sibling::td[1]
-${cfg_auth_automatic_onboarding_checkbox}  //clr-checkbox-wrapper//label[contains(@for,'oidcAutoOnboard')]
+${cve_allowlist_expires_yesterday}  //td[.//button[@class='day-btn is-today']]/preceding::td[1]
+${cve_allowlist_expires_tomorrow}  //td[.//button[@class='day-btn is-today']]/following::td[1]
+${cfg_auth_automatic_onboarding_checkbox}  //clr-checkbox-wrapper//label[contains(@class,'clr-control-label') and contains(@for,'oidcAutoOnboard')]
 ${cfg_auth_user_name_claim_input}  //*[@id='oidcUserClaim']
 
 ${cfg_auth_ldap_group_admin_dn}  //*[@id='ldapGroupAdminDN']
@@ -62,6 +62,6 @@ ${filter_dist_input}  //hbr-filter//input
 
 ${audit_log_forward_syslog_endpoint_input_id}  //*[@id='auditLogForwardEndpoint']
 ${skip_audit_log_database_checkbox}  //*[@id='skipAuditLogDatabase']
-${skip_audit_log_database_label}  //clr-checkbox-wrapper//label[contains(@for,'skipAuditLogDatabase')]
-${retain_image_last_pull_time_label}  //clr-checkbox-wrapper//label[contains(@for,'scannerSkipUpdatePullTime')]
+${skip_audit_log_database_label}  //clr-checkbox-wrapper//label[contains(@class,'clr-control-label') and contains(@for,'skipAuditLogDatabase')]
+${retain_image_last_pull_time_label}  //clr-checkbox-wrapper//label[contains(@class,'clr-control-label') and contains(@for,'scannerSkipUpdatePullTime')]
 ${retain_image_last_pull_time_checkbox}  //*[@id='scannerSkipUpdatePullTime']

tests/resources/Harbor-Pages/GC_Elements.robot

@@ -19,7 +19,7 @@ Documentation  This resource provides any keywords related to the Harbor private
 ${gc_page_xpath}  //clr-main-container//clr-vertical-nav-group//span[contains(.,'Clean Up')]
 ${gc_now_button}  //*[@id='gc-now']
 ${dry_run_button}  //*[@id='gc-dry-run']
-${checkbox_delete_untagged_artifacts}  //gc-config//clr-toggle-wrapper/label[contains(@for,'delete_untagged')]
+${checkbox_delete_untagged_artifacts}  //gc-config//clr-toggle-wrapper/label[contains(@class,'clr-control-label') and contains(@for,'delete_untagged')]
 ${latest_job_id_xpath}  //clr-datagrid//div//clr-dg-row[1]//clr-dg-cell[1]
 ${gc_schedule_edit_btn}  //*[@id='editSchedule']
 ${gc_schedule_select}  //*[@id='selectPolicy']

tests/resources/Harbor-Pages/Log_Rotation.robot

@@ -32,7 +32,7 @@ Purge Now
 Click Exclude Operation
     [Arguments]  @{exclude_operations}
     FOR  ${element}  IN  @{exclude_operations}
-        Retry Element Click  //form//div//label[contains(.,'${element}')]
+        Retry Element Click  //form//div//label[contains(@class,'clr-control-label') and contains(.,'${element}')]
     END
 
 Verify Last completed Time

tests/resources/Harbor-Pages/Project-Config.robot

@@ -8,7 +8,7 @@ Resource  ../../resources/Util.robot
 
 Goto Project Config
     Retry Element Click  //project-detail//ul/li[contains(.,'Summary')]
-    Retry Double Keywords When Error  Retry Element Click  //project-detail//ul/li[contains(.,'Configuration')]  Retry Wait Element  //clr-checkbox-wrapper/label[contains(.,'Prevent vulnerable images from running.')]
+    Retry Double Keywords When Error  Retry Element Click  //project-detail//ul/li[contains(.,'Configuration')]  Retry Wait Element  //clr-checkbox-wrapper/label[contains(@class,'clr-control-label') and contains(.,'Prevent vulnerable images from running.')]
 
 Click Project Public
     Mouse Down  //hbr-project-policy-config//input[@name='public']

tests/resources/Harbor-Pages/Project-Copy.robot

@@ -4,7 +4,7 @@ Resource  ../../resources/Util.robot
 *** Keywords ***
 Copy Image
     [Arguments]  ${tag}  ${projectname}  ${reponame}  ${is_success}=${true}
-    Retry Element Click  xpath=//clr-dg-row[contains(.,'${tag}')]//label
+    Retry Element Click  xpath=//clr-dg-row[contains(.,'${tag}')]//label[contains(@class,'clr-control-label')]
     Retry Action Keyword  Copy Image Action  ${projectname}  ${reponame}  ${is_success}
 
 Copy Image Action

tests/resources/Harbor-Pages/Project-Members.robot

@@ -56,13 +56,13 @@ Change Member Role
 
 User Can Change Role
      [arguments]  ${username}
-     Retry Element Click  xpath=//clr-dg-row[contains(.,'${username}')]//input/../label
+     Retry Element Click  xpath=//clr-dg-row[contains(.,'${username}')]//input/../label[contains(@class,'clr-control-label')]
      Retry Element Click  xpath=//*[@id='member-action']
      Retry Wait Until Page Not Contains Element  xpath=//button[@disabled='' and contains(.,'Admin')]
 
 User Can Not Change Role
      [arguments]  ${username}
-     Retry Element Click  xpath=//clr-dg-row[contains(.,'${username}')]//input/../label
+     Retry Element Click  xpath=//clr-dg-row[contains(.,'${username}')]//input/../label[contains(@class,'clr-control-label')]
      Retry Element Click  xpath=//*[@id='member-action']
      Retry Wait Until Page Contains Element  xpath=//button[@disabled='' and contains(.,'Admin')]
 
@@ -85,7 +85,7 @@ Add Guest Member To Project
 
 Delete Project Member
     [arguments]  ${member}
-    Retry Element Click  xpath=//clr-dg-row[contains(.,'${member}')]//input/../label
+    Retry Element Click  xpath=//clr-dg-row[contains(.,'${member}')]//input/../label[contains(@class,'clr-control-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  ${repo_delete_on_card_view_btn}
     Retry Double Keywords When Error  Retry Element Click  ${repo_delete_on_card_view_btn}  Retry Wait Element  xpath=${project_member_xpath}

tests/resources/Harbor-Pages/Project-Members_Elements.robot

@@ -19,7 +19,7 @@ Documentation  This resource provides any keywords related to the Harbor private
 ${project_member_tag_xpath}  //clr-main-container//project-detail/clr-tabs//a[contains(.,'Members')]
 ${project_member_add_button_xpath}  //project-detail//button[contains(.,'User')]
 ${project_member_add_username_xpath}  //*[@id='member_name']
-${project_member_add_admin_xpath}  /html/body/harbor-app/harbor-shell/clr-main-container/div/div/project-detail/ng-component/div/div[1]/div/div[1]/add-member/clr-modal/div/div[1]/div/div[1]/div/div[2]/form/section/div[2]/div[1]/label
+${project_member_add_admin_xpath}  /html/body/harbor-app/harbor-shell/clr-main-container/div/div/project-detail/ng-component/div/div[1]/div/div[1]/add-member/clr-modal/div/div[1]/div/div[1]/div/div[2]/form/section/div[2]/div[1]/label[contains(@class,'clr-control-label')]
 ${project_member_add_save_button_xpath}  /html/body/harbor-app/harbor-shell/clr-main-container/div/div/project-detail/ng-component/div/div[1]/div/div[1]/add-member/clr-modal/div/div[1]/div/div[1]/div/div[3]/button[2]
 ${project_member_search_button_xpath}  //project-detail//hbr-filter/span/clr-icon
 ${project_member_search_text_xpath}  //project-detail//hbr-filter/span/input

tests/resources/Harbor-Pages/Project-P2P-Preheat.robot

@@ -29,7 +29,7 @@ Select Distribution For P2P Preheat
 
 Select P2P Preheat Policy
     [Arguments]  ${name}
-    Retry Element Click  //clr-dg-row[contains(.,'${name}')]//clr-radio-wrapper/label
+    Retry Element Click  //clr-dg-row[contains(.,'${name}')]//clr-radio-wrapper/label[contains(@class,'clr-control-label')]
 
 P2P Preheat Policy Exist
     [Arguments]  ${name}  ${repo}=${null}

tests/resources/Harbor-Pages/Project-Repository.robot

@@ -31,7 +31,7 @@ View Scan Error Log
     Retry Element Click  xpath=${view_log_xpath}
 
 Scan Artifact
-    [Arguments]  ${project}  ${repo}  ${label_xpath}=//clr-dg-row//label[1]
+    [Arguments]  ${project}  ${repo}  ${label_xpath}=//clr-dg-row//label[contains(@class,'clr-control-label')][1]
     Go Into Repo  ${project}  ${repo}
     Retry Element Click  ${label_xpath}
     Retry Element Click  ${scan_artifact_btn}

tests/resources/Harbor-Pages/Project-Webhooks.robot

@@ -25,12 +25,12 @@ Select Payload Format
 
 Select Event Type
     [Arguments]  @{event_type}
-    ${elements}=  Get WebElements  //form//div[contains(@class,'clr-control-inline')]//label
+    ${elements}=  Get WebElements  //form//div[contains(@class,'clr-control-inline')]//label[contains(@class,'clr-control-label')]
     FOR  ${element}  IN  @{elements}
         Retry Element Click  ${element}
     END
     FOR  ${element}  IN  @{event_type}
-        Retry Element Click  //form//div[contains(@class,'clr-control-inline')]//label[contains(.,'${element}')]
+        Retry Element Click  //form//div[contains(@class,'clr-control-inline')]//label[contains(@class,'clr-control-label') and contains(.,'${element}')]
     END
 
 Update A Webhook

tests/resources/Harbor-Pages/Project.robot

@@ -128,7 +128,7 @@ Filter Repo
 
 Delete Repo
     [Arguments]  ${pro_name}  ${repo_name}
-    ${element_repo_checkbox}=  Set Variable  xpath=//clr-dg-row[contains(.,'${pro_name}/${repo_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label
+    ${element_repo_checkbox}=  Set Variable  xpath=//clr-dg-row[contains(.,'${pro_name}/${repo_name}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')]
     Filter Repo  ${pro_name}  ${repo_name}
     Retry Double Keywords When Error  Retry Element Click  ${element_repo_checkbox}  Wait Until Element Is Visible And Enabled  ${repo_delete_btn}
     Retry Double Keywords When Error  Retry Element Click  ${repo_delete_btn}  Wait Until Element Is Visible And Enabled  ${delete_confirm_btn}
@@ -145,7 +145,7 @@ Delete Repo on CardView
 Delete Project
     [Arguments]  ${projectname}
     Navigate To Projects
-    Retry Element Click  xpath=//clr-dg-row[contains(.,'${projectname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label
+    Retry Element Click  xpath=//clr-dg-row[contains(.,'${projectname}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')]
     Retry Element Click  ${project_action_xpath}
     Retry Element Click  xpath=//*[@id='delete-project']
     Retry Element Click  //clr-modal//button[contains(.,'DELETE')]
@@ -292,7 +292,7 @@ Switch To Project Repo
 
 Add Labels To Tag
     [Arguments]  ${tagName}  ${labelName}
-    Retry Element Click  xpath=//clr-dg-row[contains(.,'${tagName}')]//label
+    Retry Element Click  xpath=//clr-dg-row[contains(.,'${tagName}')]//label[contains(@class,'clr-control-label')]
     Retry Element Click  xpath=//clr-dg-action-bar//clr-dropdown//span
     Retry Element Click  xpath=//clr-dropdown-menu//clr-dropdown//button[contains(.,'Add Labels')]
     Retry Element Click  xpath=//clr-dropdown//div//label[contains(.,'${labelName}')]
@@ -317,6 +317,7 @@ Filter Labels In Tags
 Get Statics
     [Arguments]  ${locator}
     Reload Page
+    Wait Until Element Is Visible And Enabled  ${locator}
     ${privaterepo}=  Get Text  ${locator}
     [Return]  ${privaterepo}
 
@@ -393,7 +394,7 @@ Should be Accessory deleted
 Export CVEs
     [Arguments]  ${project}  ${repositories}  ${tags}  ${labels}  ${cve_ids}
     Filter Project  ${project}
-    Retry Element Click  //clr-dg-row[contains(.,'${project}')]//div[contains(@class,'clr-checkbox-wrapper')]//label
+    Retry Element Click  //clr-dg-row[contains(.,'${project}')]//div[contains(@class,'clr-checkbox-wrapper')]//label[contains(@class,'clr-control-label')]
     Retry Element Click  ${project_action_xpath}
     Retry Button Click  ${export_cve_btn}
     Retry Text Input  ${export_cve_filter_repo_input}  ${repositories}

tests/resources/Harbor-Pages/Project_Elements.robot

@@ -18,7 +18,7 @@ Documentation  This resource provides any keywords related to the Harbor private
 *** Variables ***
 ${create_project_button_xpath}  //clr-main-container//button[contains(., 'New Project')]
 ${project_name_xpath}  //*[@id='create_project_name']
-${project_public_xpath}  //input[@name='public']/..//label
+${project_public_xpath}  //input[@name='public']/..//label[contains(@class,'clr-control-label')]
 ${project_save_css}  html body.no-scrolling harbor-app harbor-shell clr-main-container.main-container div.content-container div.content-area.content-area-override project div.row div.col-lg-12.col-md-12.col-sm-12.col-xs-12 div.row.flex-items-xs-between div.option-left create-project clr-modal div.modal div.modal-dialog div.modal-content div.modal-footer button.btn.btn-primary
 ${projects_xpath}  //clr-main-container//clr-vertical-nav//a[contains(.,'Projects')]
 ${project_replication_xpath}  //project-detail//a[contains(.,'Replication')]
@@ -57,16 +57,16 @@ ${tag_table_column_size}  xpath=//clr-dg-column//span[contains(.,'Size')]
 ${tag_table_column_vulnerability}  xpath=//clr-dg-column//span[contains(.,'Vulnerability')]
 ${tag_images_btn}  xpath=//hbr-repository//button[contains(.,'Images')]
 ${project_member_action_xpath}  xpath=//*[@id='member-action']
-${project_member_set_role_xpath}  xpath=//clr-dropdown-menu//label[contains(.,'Set Role')]
+${project_member_set_role_xpath}  xpath=//clr-dropdown-menu//label[contains(@class,'clr-control-label') and contains(.,'Set Role')]
 ${project_config_public_checkbox}  xpath=//input[@name='public']
 ${project_config_content_trust_checkbox}  xpath=//input[@name='content-trust']
 ${project_config_scan_images_on_push_checkbox}  xpath=//input[@name='scan-image-on-push']
 ${project_config_prevent_vulnerable_images_from_running_checkbox}  xpath=//input[@name='prevent-vulenrability-image-input']
 ${project_config_severity_select}  xpath=//select[@id='severity']
-${project_config_public_checkbox_label}  xpath=//*[@id="clr-wrapper-public"]/div/clr-checkbox-wrapper/label
-${project_config_prevent_vulenrability_checkbox_label}    xpath=//*[@id='prevent-vulenrability-image']//clr-checkbox-wrapper//label
-${project_config_system_wl_radio_input}    xpath=//clr-radio-wrapper//label[contains(.,'System allowlist')]
-${project_config_project_wl_radio_input}    xpath=//clr-radio-wrapper//label[contains(.,'Project allowlist')]
+${project_config_public_checkbox_label}  xpath=//*[@id="clr-wrapper-public"]/div/clr-checkbox-wrapper/label[contains(@class,'clr-control-label')]
+${project_config_prevent_vulenrability_checkbox_label}    xpath=//*[@id='prevent-vulenrability-image']//clr-checkbox-wrapper//label[contains(@class,'clr-control-label')]
+${project_config_system_wl_radio_input}    xpath=//clr-radio-wrapper//label[contains(@class,'clr-control-label') and contains(.,'System allowlist')]
+${project_config_project_wl_radio_input}    xpath=//clr-radio-wrapper//label[contains(@class,'clr-control-label') and contains(.,'Project allowlist')]
 ${project_config_system_wl_radio_input_id}    systemAllowlistOrProjectAllowlist
 ${project_config_project_wl_radio_input_id}    systemAllowlistOrProjectAllowlist
 ${project_config_project_wl_add_btn}    xpath=//*[@id='show-add-modal']

tests/resources/Harbor-Pages/Public_Elements.robot

@@ -20,9 +20,9 @@ ${delete_btn}  //clr-modal//button[contains(.,'DELETE')]
 ${delete_btn_2}  //button[contains(.,'Delete')]
 ${default_scanner_info_close_icon}  /html/body/harbor-app/harbor-shell/clr-main-container/div[1]/div[3]/clr-icon
 ${back_to_home_link}  /html/body/harbor-app/harbor-shell/clr-main-container/div[2]/div/search-result/div/div[2]/a
-${select_all_project_box}  //label[contains(@for, 'clr-dg-select-all-clr-id-75')]
+${select_all_project_box}  //label[contains(@class,'clr-control-label') and contains(@for, 'clr-dg-select-all-clr-id-75')]
 ${export_cve_btn}  //button[contains(.,'Export CVEs')]
 ${export_cve_filter_repo_input}  //*[@id='repo']
 ${export_cve_filter_tag_input}  //*[@id='tag']
 ${export_cve_filter_cveid_input}  //*[@id='ids']
-${export_btn}  //clr-modal//button[contains(.,'EXPORT')]
+${export_btn}  //clr-modal//button[contains(.,'EXPORT')]

tests/resources/Harbor-Pages/Replication.robot

@@ -165,7 +165,7 @@ Trigger Replication Manual
     [Arguments]  ${rule}
     Retry Element Click  ${rule_filter_search}
     Retry Text Input   ${rule_filter_input}  ${rule}
-    Retry Element Click  //clr-dg-row[contains(.,'${rule}')]//label
+    Retry Element Click  //clr-dg-row[contains(.,'${rule}')]//label[contains(@class,'clr-control-label')]
     Retry Element Click  ${action_bar_replicate}
     Retry Wait Until Page Contains Element  ${dialog_replicate}
     #change from click to mouse down and up
@@ -177,7 +177,7 @@ Rename Rule
     [Arguments]  ${rule}  ${newname}
     Retry Element Click  ${rule_filter_search}
     Retry Text Input  ${rule_filter_input}  ${rule}
-    Retry Element Click  //clr-dg-row[contains(.,'${rule}')]//label
+    Retry Element Click  //clr-dg-row[contains(.,'${rule}')]//label[contains(@class,'clr-control-label')]
     Retry Element Click  ${replication_rule_action}
     Retry Element Click  ${replication_rule_action_bar_edit}
     Retry Text Input  ${rule_name}  ${newname}