commit 524cb04343ac35273763322a6f86d72357cb58a1
author George Keishing <gkeishin@in.ibm.com> Thu Oct 13 10:20:17 2016 -0500
committer George Keishing <gkeishin@in.ibm.com> Thu Oct 13 11:24:56 2016 -0500
tree d914f04bab93d42187f048ddc014bb4fcf49ff55
parent d434c51f6d6fc6a382bf8c48a498d5040b8fcf4b

Set REST GET and POST timeout

By default the GET and POST connection timeout is set to None
which means it'll wait until the connection is closed. Now with
this timeout the session will hang up post 10 seconds and free
up the session for other test request to come in.

Piggy back the REST restart disabling via skip list in this
commit

Resolves openbmc/openbmc-test-automation#165

Change-Id: Iafcbff892e7c5677a46fb096e21eca6ad5a279f0
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

lib/rest_client.robot

diff --git a/lib/rest_client.robot b/lib/rest_client.robot
index 3d7a36c..1cd1439 100644
--- a/lib/rest_client.robot
+++ b/lib/rest_client.robot
@@ -64,7 +64,7 @@
     ${base_uri}=    Catenate    SEPARATOR=    ${DBUS_PREFIX}    ${uri}
     Log Request    method=Get    base_uri=${base_uri}    args=&{kwargs}
     Initialize OpenBMC
-    ${ret}=    Get Request    openbmc    ${base_uri}    &{kwargs}
+    ${ret}=    Get Request    openbmc    ${base_uri}    &{kwargs}  timeout=10
     Log Response    ${ret}
     [Return]    ${ret}
 
@@ -75,7 +75,7 @@
     set to dictionary   ${kwargs}       headers     ${headers}
     Log Request    method=Post    base_uri=${base_uri}    args=&{kwargs}
     Initialize OpenBMC
-    ${ret}=    Post Request    openbmc    ${base_uri}    &{kwargs}
+    ${ret}=    Post Request    openbmc    ${base_uri}    &{kwargs}  timeout=10
     Log Response    ${ret}
     [Return]    ${ret}
 
@@ -86,7 +86,7 @@
     set to dictionary   ${kwargs}       headers     ${headers}
     Log Request    method=Put    base_uri=${base_uri}    args=&{kwargs}
     Initialize OpenBMC
-    ${ret}=    Put Request    openbmc    ${base_uri}    &{kwargs}
+    ${ret}=    Put Request    openbmc    ${base_uri}    &{kwargs}  timeout=10
     Log Response    ${ret}
     [Return]    ${ret}
 
@@ -95,7 +95,7 @@
     ${base_uri}=    Catenate    SEPARATOR=    ${DBUS_PREFIX}    ${uri}
     Log Request    method=Delete    base_uri=${base_uri}    args=&{kwargs}
     Initialize OpenBMC
-    ${ret}=    Put Request    openbmc    ${base_uri}    &{kwargs}
+    ${ret}=    Put Request    openbmc    ${base_uri}    &{kwargs}  timeout=10
     Log Response    ${ret}
     [Return]    ${ret}
 

test_lists/skip_test

diff --git a/test_lists/skip_test b/test_lists/skip_test
index 2ab9588..c075805 100644
--- a/test_lists/skip_test
+++ b/test_lists/skip_test
@@ -23,6 +23,7 @@
 -e Validate_Beep_LEDs_Test_Cases
 #https://github.com/openbmc/openbmc-test-automation/issues/130
 -e Test_OpenBMC_Services_Autorestart_Policy
+-e Test_Restart_Policy_for_openbmc_service
 #https://github.com/openbmc/openbmc-test-automation/issues/90
 -e Verify_System_VPD_Properties
 #https://github.com/openbmc/openbmc/issues/93

tests/test_openbmc_service_restart_policy.robot

diff --git a/tests/test_openbmc_service_restart_policy.robot b/tests/test_openbmc_service_restart_policy.robot
index b1cc91d..6062526 100644
--- a/tests/test_openbmc_service_restart_policy.robot
+++ b/tests/test_openbmc_service_restart_policy.robot
@@ -62,6 +62,7 @@
 Test Restart Policy for openbmc service
     [Documentation]     This testcase will kill the service and make sure it
     ...                 does restart after that
+    [Tags]  Test_Restart_Policy_for_openbmc_service
 
     ${MainPID}=   Execute Restart Policy Command
     ...   systemctl -p MainPID show phosphor-settings.service| cut -d = -f2