From 3f213df5956ed9ae9a650ac280f1fa809c2c9762 Mon Sep 17 00:00:00 2001
From: AllForNothing <sshijun@vmware.com>
Date: Mon, 28 Sep 2020 10:37:43 +0800
Subject: [PATCH] Fix nightly case for replication

Signed-off-by: AllForNothing <sshijun@vmware.com>
---
 tests/resources/Harbor-Pages/Configuration.robot |  4 ++--
 tests/resources/Harbor-Pages/Replication.robot   | 13 ++++++++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tests/resources/Harbor-Pages/Configuration.robot b/tests/resources/Harbor-Pages/Configuration.robot
index f27795158..ed07bf593 100644
--- a/tests/resources/Harbor-Pages/Configuration.robot
+++ b/tests/resources/Harbor-Pages/Configuration.robot
@@ -399,7 +399,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
     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}
@@ -410,7 +410,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
+    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  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}
diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot
index 175a36c85..d679dfb98 100644
--- a/tests/resources/Harbor-Pages/Replication.robot
+++ b/tests/resources/Harbor-Pages/Replication.robot
@@ -149,6 +149,7 @@ Rename 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  ${replication_action}
     Retry Element Click  ${action_bar_edit}
     Retry Text Input  ${rule_name}  ${newname}
     Retry Element Click  ${rule_save_button}
@@ -158,6 +159,7 @@ Delete 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  ${replication_action}
     Retry Element Click  ${action_bar_delete}
     Retry Wait Until Page Contains Element  ${dialog_delete}
     #change from click to mouse down and up
@@ -184,10 +186,18 @@ Find Item And Click Edit Button
     Retry Select Object    ${name}
     Retry Element Click    ${action_bar_edit}
 
+Find Rule And Click Edit Button
+    [Arguments]    ${name}
+    Filter Object    ${name}
+    Retry Select Object    ${name}
+    Retry Element Click    ${replication_action}
+    Retry Element Click    ${action_bar_edit}
+
 Find Item And Click Delete Button
     [Arguments]    ${name}
     Filter Object    ${name}
     Retry Select Object    ${name}
+    Retry Element Click    ${replication_action}
     Retry Element Click    ${action_bar_delete}
 
 Switch To Replication Manage Page
@@ -197,7 +207,7 @@ Switch To Replication Manage Page
 
 Edit Replication Rule By Name
     [Arguments]    ${name}
-    Retry Double Keywords When Error  Switch To Replication Manage Page  "NULL"  Find Item And Click Edit Button  ${name}
+    Retry Double Keywords When Error  Switch To Replication Manage Page  "NULL"  Find Rule And Click Edit Button  ${name}
 
 Delete Replication Rule By Name
     [Arguments]    ${name}
@@ -246,6 +256,7 @@ Delete Replication Rule
     Retry Text Input   ${endpoint_filter_input}  ${name}
     #click checkbox before target endpoint
     Retry Element Click  //clr-dg-row[contains(.,'${name}')]//label
+    Retry Element Click  ${replication_action}
     Retry Element Click  ${action_bar_delete}
     Wait Until Page Contains Element  ${dialog_delete}
     Retry Element Click  ${dialog_delete}