From a6f14c6d89c6a9526a54b63cd330e4ea729d5c37 Mon Sep 17 00:00:00 2001
From: sigsbee <myufei@vmware.com>
Date: Tue, 5 Jun 2018 18:51:11 +0800
Subject: [PATCH] Update test case to increase passrate (#5083)

Update test case order to avoid scan on push fail
Add sleep time to avoid view scan results fail
Change keyword to wait unitl avoid delete operation fail
Change delete rule and repicate manual confirm to mouse down and up
---
 .../resources/Harbor-Pages/Replication.robot  |  8 ++++--
 tests/resources/Harbor-Pages/ToolKit.robot    |  4 +--
 .../Harbor-Pages/Vulnerability.robot          |  2 +-
 .../robot-cases/Group11-Nightly/Nightly.robot | 26 +++++++++----------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot
index da4ab936d..9998b1f88 100644
--- a/tests/resources/Harbor-Pages/Replication.robot
+++ b/tests/resources/Harbor-Pages/Replication.robot
@@ -142,7 +142,9 @@ Trigger Replication Manual
     Click Element  //clr-dg-row[contains(.,'${rule}')]//label
     Click Element  ${action_bar_replicate}
     Wait Until Page Contains Element  ${dialog_replicate}
-    Click Element  ${dialog_replicate}
+    #change from click to mouse down and up 
+    Mouse Down  ${dialog_replicate}
+    Mouse Up  ${dialog_replicate}
     Sleep  2
     Wait Until Page Contains Element  //clr-tab-content//div[contains(.,'${rule}')]/../div/clr-icon[@shape="success-standard"]
     Sleep  1
@@ -165,7 +167,9 @@ Delete Rule
     Click Element  //clr-dg-row[contains(.,'${rule}')]//label
     Click Element  ${action_bar_delete}
     Wait Until Page Contains Element  ${dialog_delete}
-    Click Element  ${dialog_delete}
+    #change from click to mouse down and up
+    Mouse Down  ${dialog_delete}
+    Mouse Up  ${dialog_delete}
     Sleep  2
 
 Filter Rule
diff --git a/tests/resources/Harbor-Pages/ToolKit.robot b/tests/resources/Harbor-Pages/ToolKit.robot
index f26643dcc..74a601426 100644
--- a/tests/resources/Harbor-Pages/ToolKit.robot
+++ b/tests/resources/Harbor-Pages/ToolKit.robot
@@ -23,13 +23,13 @@ ${HARBOR_VERSION}  v1.1.1
 Delete Success
     [Arguments]  @{obj}
     :For  ${obj}  in  @{obj}
-    \    Page Should Contain Element  //clr-tab-content//div[contains(.,'${obj}')]/../div/clr-icon[@shape="success-standard"]
+    \    Wait Until Page Contains Element  //clr-tab-content//div[contains(.,'${obj}')]/../div/clr-icon[@shape="success-standard"]
     Sleep  1
 
 Delete Fail
     [Arguments]  @{obj}
     :For  ${obj}  in  @{obj}
-    \    Page Should Contain Element  //clr-tab-content//div[contains(.,'${obj}')]/../div/clr-icon[@shape="error-standard"]
+    \    Wait Until Page Contains Element  //clr-tab-content//div[contains(.,'${obj}')]/../div/clr-icon[@shape="error-standard"]
     Sleep  1
 
 Filter Object
diff --git a/tests/resources/Harbor-Pages/Vulnerability.robot b/tests/resources/Harbor-Pages/Vulnerability.robot
index 5afdec043..be2b0efde 100644
--- a/tests/resources/Harbor-Pages/Vulnerability.robot
+++ b/tests/resources/Harbor-Pages/Vulnerability.robot
@@ -45,7 +45,7 @@ Scan Repo
     #select one tag
     Click Element  //clr-dg-row[contains(.,"${tagname}")]//label
     Click Element  //button[contains(.,'Scan')]
-    Sleep  1
+    Sleep  5
     Run Keyword If  '${status}' == 'Succeed'  Wait Until Element Is Visible  //hbr-vulnerability-bar//hbr-vulnerability-summary-chart
     Run Keyword If  '${status}' == 'Fail'  Wait Until Element Is Visible  //hbr-vulnerability-bar//a
 
diff --git a/tests/robot-cases/Group11-Nightly/Nightly.robot b/tests/robot-cases/Group11-Nightly/Nightly.robot
index a1a8cdef5..88f4abe4e 100644
--- a/tests/robot-cases/Group11-Nightly/Nightly.robot
+++ b/tests/robot-cases/Group11-Nightly/Nightly.robot
@@ -474,19 +474,6 @@ Test Case - Project Level Image Serverity Policy
     Cannot pull image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  library  haproxy
     Close Browser
 
-Test Case - Scan Image On Push
-    Init Chrome Driver
-    Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
-    Go Into Project  library
-    Goto Project Config
-    Enable Scan On Push
-    Push Image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  library  memcached
-    Back To Projects
-    Go Into Project  library
-    Go Into Repo  memcached
-    Summary Chart Should Display  latest
-    Close Browser
-
 Test Case - Verify Download Ca Link
     Init Chrome Driver
     Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
@@ -686,6 +673,19 @@ Test Case - View Scan Error
     View Scan Error Log
     Close Browser
 
+Test Case - Scan Image On Push
+    Init Chrome Driver
+    Sign In Harbor  ${HARBOR_URL}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}
+    Go Into Project  library
+    Goto Project Config
+    Enable Scan On Push
+    Push Image  ${ip}  ${HARBOR_ADMIN}  ${HARBOR_PASSWORD}  library  memcached
+    Back To Projects
+    Go Into Project  library
+    Go Into Repo  memcached
+    Summary Chart Should Display  latest
+    Close Browser
+
 #Test Case - OVA reboot
 #    Reboot VM  ${vm_name}  ${vc_host}  ${vc_user}  ${vc_password}
 #    Wait for Harbor Ready  https  ${ip}