From efb3759d147ad225e00f161a49ab1e9ed4542b1f Mon Sep 17 00:00:00 2001
From: sigsbee <23101283+sigsbee@users.noreply.github.com>
Date: Tue, 10 Apr 2018 19:41:48 +0800
Subject: [PATCH] Update test keyword (#4599)

---
 tests/resources/Docker-Util.robot                     | 8 ++++++--
 tests/resources/Harbor-Pages/Project-Repository.robot | 3 +--
 tests/resources/Harbor-Pages/Replication.robot        | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/resources/Docker-Util.robot b/tests/resources/Docker-Util.robot
index b45cc6146..a92907ffa 100644
--- a/tests/resources/Docker-Util.robot
+++ b/tests/resources/Docker-Util.robot
@@ -38,7 +38,9 @@ Pull image
 Push image
     [Arguments]  ${ip}  ${user}  ${pwd}  ${project}  ${image}
     Log To Console  \nRunning docker push ${image}...
-    ${rc}=  Run And Return Rc  docker pull ${image}
+    ${rc}  ${output}=  Run And Return Rc And Output  docker pull ${image}
+    Log  ${output}
+    Should Be Equal As Integers  ${rc}  0
     ${rc}  ${output}=  Run And Return Rc And Output  docker login -u ${user} -p ${pwd} ${ip}
     Log  ${output}
     Should Be Equal As Integers  ${rc}  0
@@ -52,7 +54,9 @@ Push Image With Tag
 #tag1 is tag of image on docker hub,default latest,use a version existing if you do not want to use latest    
     [Arguments]  ${ip}  ${user}  ${pwd}  ${project}  ${image}  ${tag}  ${tag1}=latest
     Log To Console  \nRunning docker push ${image}...
-    ${rc}=  Run And Return Rc  docker pull ${image}:${tag1}
+    ${rc}  ${output}=  Run And Return Rc  docker pull ${image}:${tag1}
+    Log  ${output}
+    Should Be Equal As Integers  ${rc}  0
     ${rc}  ${output}=  Run And Return Rc And Output  docker login -u ${user} -p ${pwd} ${ip}
     Log  ${output}
     Should Be Equal As Integers  ${rc}  0
diff --git a/tests/resources/Harbor-Pages/Project-Repository.robot b/tests/resources/Harbor-Pages/Project-Repository.robot
index 7601d3043..d12d50015 100644
--- a/tests/resources/Harbor-Pages/Project-Repository.robot
+++ b/tests/resources/Harbor-Pages/Project-Repository.robot
@@ -31,6 +31,5 @@ View Scan Error Log
     Click Element  xpath=${view_log_xpath}
     Sleep  1
     Capture Page Screenshot  viewlog.png
-    Wait Until Page Contains  Entered scan initializer
+    Wait Until Page Contains  View Scanning Job Log
     Wait Until Page Contains  ERROR
-    Wait Until Page Contains  View Scanning Job Log
\ No newline at end of file
diff --git a/tests/resources/Harbor-Pages/Replication.robot b/tests/resources/Harbor-Pages/Replication.robot
index 73ca41d40..8570530f6 100644
--- a/tests/resources/Harbor-Pages/Replication.robot
+++ b/tests/resources/Harbor-Pages/Replication.robot
@@ -180,6 +180,7 @@ Delete Endpoint
     Sleep  1
     #click checkbox before target endpoint
     Click Element  //clr-dg-row[contains(.,'${name}')]//label
+    Sleep  1
     Click Element  ${action_bar_delete}
     Wait Until Page Contains Element  ${dialog_delete}
     Click Element  ${dialog_delete}