From 75e6b5d91ce11d90e42e3b8151d4c3210666b44f Mon Sep 17 00:00:00 2001
From: sigsbee <23101283+sigsbee@users.noreply.github.com>
Date: Thu, 12 Apr 2018 11:42:54 +0800
Subject: [PATCH] Fix up keyword and test case (#4629)

Fix up keyword: push image with tag
Fix up case: Project Admin Add Labels To Repo
Fix up case: Proj Replication Jobs Log View
---
 tests/resources/Docker-Util.robot                   | 2 +-
 tests/robot-cases/Group11-Nightly/Nightly.robot     | 2 +-
 tests/robot-cases/Group11-Nightly/Replication.robot | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/resources/Docker-Util.robot b/tests/resources/Docker-Util.robot
index a92907ffa..3b0695f42 100644
--- a/tests/resources/Docker-Util.robot
+++ b/tests/resources/Docker-Util.robot
@@ -54,7 +54,7 @@ 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}  ${output}=  Run And Return Rc  docker pull ${image}:${tag1}
+    ${rc}  ${output}=  Run And Return Rc And Output  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}
diff --git a/tests/robot-cases/Group11-Nightly/Nightly.robot b/tests/robot-cases/Group11-Nightly/Nightly.robot
index 21658d3ef..fb09c7d60 100644
--- a/tests/robot-cases/Group11-Nightly/Nightly.robot
+++ b/tests/robot-cases/Group11-Nightly/Nightly.robot
@@ -316,7 +316,7 @@ TestCase - Project Admin Add Labels To Repo
     Init Chrome Driver
     ${d}=   Get Current Date    result_format=%m%s
     Create An New Project With New User  url=${HARBOR_URL}  username=test${d}  email=test${d}@vmware.com  realname=test${d}  newPassword=Test1@34  comment=harbor  projectname=project${d}  public=false
-    Push image  ip=${ip}  user=test${d}  pwd=Test1@34  project=project${d}  vmware/photon:1.0
+    Push Image With Tag  ${ip}  test${d}  Test1@34  project${d}  vmware/photon  1.0  1.0
 
     Go Into Project  project${d}
     Sleep  2
diff --git a/tests/robot-cases/Group11-Nightly/Replication.robot b/tests/robot-cases/Group11-Nightly/Replication.robot
index 626a56f47..0b136f63b 100644
--- a/tests/robot-cases/Group11-Nightly/Replication.robot
+++ b/tests/robot-cases/Group11-Nightly/Replication.robot
@@ -147,7 +147,6 @@ Test Case - Proj Replication Jobs Log View
     Filter Rule  rule${d}
     Select Rule  rule${d}
     Wait Until Page Contains  transfer 
-    Stop Jobs    #temp disable
-    Wait Until Page Contains  stopped
+    Wait Until Page Contains  error
     View Job Log  busybox
     Close Browser