Define sulfur version

[integration/test.git] / csit / libraries / GBP / DockerUtils.robot

diff --git a/csit/libraries/GBP/DockerUtils.robot b/csit/libraries/GBP/DockerUtils.robot
old mode 100755 (executable)
new mode 100644 (file)
index dc96e77..99c44ef
--- a/csit/libraries/GBP/DockerUtils.robot
+++ b/csit/libraries/GBP/DockerUtils.robot
@@ -1,6 +1,5 @@
 *** Settings ***
 Library           SSHLibrary
-Resource          ../Utils.robot
 
 *** Variables ***
 
@@ -34,7 +33,7 @@ Stop HTTP Service on Docker
     ${stdout}    SSHLibrary.Execute Command    docker exec ${docker_name} kill ${stdout}    return_stdout=True    return_stderr=False    return_rc=False
 
 Curl from Docker
-    [Arguments]    ${docker_name}    ${dest_address}    ${service_port}=80    ${connect_timeout}=2    ${retry}=3x    ${retry_after}=1s
+    [Arguments]    ${docker_name}    ${dest_address}    ${service_port}=80    ${connect_timeout}=2    ${retry}=5x    ${retry_after}=1s
     [Documentation]    Sends HTTP request to remote server. Endless curl should not be running.
     ${output}    SSHLibrary.Execute Command    docker exec ${docker_name} ls | grep curl_running    return_stdout=True    return_stderr=False    return_rc=False
     Should Be Empty    ${output}
@@ -48,8 +47,7 @@ Start Endless Curl from Docker
     Should Be Empty    ${output}
     ${output}    SSHLibrary.Execute Command    docker exec ${docker_name} touch curl_running && echo success    return_stdout=True    return_stderr=False    return_rc=False
     Should Contain    ${output}    success
-    Wait Until Keyword Succeeds    ${retry}    ${retry_after}    Execute Curl    ${docker_name}    ${dest_address}    ${service_port}
-    ...    endless="TRUE"    sleep=${sleep}
+    Execute Curl    ${docker_name}    ${dest_address}    ${service_port}    endless="TRUE"
 
 Stop Endless Curl from Docker
     [Arguments]    ${docker_name}
@@ -77,7 +75,7 @@ Test Port On Docker
 Execute Curl
     [Arguments]    ${docker_name}    ${dest_address}    ${service_port}    ${endless}="FALSE"    ${sleep}=1
     [Documentation]    Executes curl or curl loop for caller methods based on given parameters.
-    ${output}    SSHLibrary.Execute Command    docker exec ${docker_name} curl ${dest_address}:${service_port} >/dev/null 2>&1 && echo success
+    Run Keyword If    ${endless} == "TRUE"    Run Keywords    SSHLibrary.Execute Command    docker exec -d ${docker_name} /bin/sh -c "while [ -f curl_running ]; do curl ${dest_address}:${service_port} -m 1 && sleep ${sleep}; done"
+    ...    AND    Return From Keyword
+    ${output}    SSHLibrary.Execute Command    docker exec ${docker_name} curl ${dest_address}:${service_port} -m 5 >/dev/null 2>&1 && echo success
     Should Contain    ${output}    success
-    Run Keyword If    ${endless} == "TRUE"    SSHLibrary.Execute Command    docker exec -d ${docker_name} /bin/sh -c "while [ -f curl_running ]; do curl ${dest_address}:${service_port} ; sleep ${sleep}; done"
-    Log    ${output}