Update test keyword (#4599)

This commit is contained in:
sigsbee 2018-04-10 19:41:48 +08:00 committed by Yan
parent 0d576fb19b
commit efb3759d14
3 changed files with 8 additions and 4 deletions

View File

@ -38,7 +38,9 @@ Pull image
Push image Push image
[Arguments] ${ip} ${user} ${pwd} ${project} ${image} [Arguments] ${ip} ${user} ${pwd} ${project} ${image}
Log To Console \nRunning docker push ${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} ${rc} ${output}= Run And Return Rc And Output docker login -u ${user} -p ${pwd} ${ip}
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 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 #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 [Arguments] ${ip} ${user} ${pwd} ${project} ${image} ${tag} ${tag1}=latest
Log To Console \nRunning docker push ${image}... 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} ${rc} ${output}= Run And Return Rc And Output docker login -u ${user} -p ${pwd} ${ip}
Log ${output} Log ${output}
Should Be Equal As Integers ${rc} 0 Should Be Equal As Integers ${rc} 0

View File

@ -31,6 +31,5 @@ View Scan Error Log
Click Element xpath=${view_log_xpath} Click Element xpath=${view_log_xpath}
Sleep 1 Sleep 1
Capture Page Screenshot viewlog.png Capture Page Screenshot viewlog.png
Wait Until Page Contains Entered scan initializer
Wait Until Page Contains ERROR
Wait Until Page Contains View Scanning Job Log Wait Until Page Contains View Scanning Job Log
Wait Until Page Contains ERROR

View File

@ -180,6 +180,7 @@ Delete Endpoint
Sleep 1 Sleep 1
#click checkbox before target endpoint #click checkbox before target endpoint
Click Element //clr-dg-row[contains(.,'${name}')]//label Click Element //clr-dg-row[contains(.,'${name}')]//label
Sleep 1
Click Element ${action_bar_delete} Click Element ${action_bar_delete}
Wait Until Page Contains Element ${dialog_delete} Wait Until Page Contains Element ${dialog_delete}
Click Element ${dialog_delete} Click Element ${dialog_delete}