commit 7e5dc5926b83564fb94f3d92634e16db9f29ab02
author Sweta Potthuri <spotthur@in.ibm.com> Mon Jul 03 06:10:02 2017 -0500
committer Andrew Geissler <geissonator@yahoo.com> Wed Jul 05 15:23:35 2017 +0000
tree 9981bd9bcb15825917467a96a874d06b6b49c64a
parent b2c50f1ca8e0f6b98c542106938e7e75e115a849

Fixes the Turbo Setting for Barreleye and Palmetto Systems.

Adding all turbo setting related test cases
in skip list of NA platform.

Moving turbo setting related setup and teardown
in required test cases.

Resolves openbmc/openbmc-test-automation#745

Change-Id: I13ff553c01c7a61a1aab45ec432d7088582709a3
Signed-off-by: Sweta Potthuri <spotthur@in.ibm.com>

test_lists/skip_test_barreleye

diff --git a/test_lists/skip_test_barreleye b/test_lists/skip_test_barreleye
index 007aafb..91253a6 100644
--- a/test_lists/skip_test_barreleye
+++ b/test_lists/skip_test_barreleye
@@ -51,3 +51,7 @@
 # Network tests for xyz interface.
 # https://github.com/openbmc/openbmc-test-automation/issues/729
 -e Network_Test
+# FSI Related Test Cases NA for Barreleye System.
+-e Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
+-e Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
+-e Verify_Setting_OCC_Turbo_Via_REST

test_lists/skip_test_palmetto

diff --git a/test_lists/skip_test_palmetto b/test_lists/skip_test_palmetto
index 7122418..dd1a39f 100644
--- a/test_lists/skip_test_palmetto
+++ b/test_lists/skip_test_palmetto
@@ -58,3 +58,8 @@
 # Network tests for xyz interface.
 # https://github.com/openbmc/openbmc-test-automation/issues/729
 -e Network_Test
+# FSI Related Test Cases NA for Palmetto System.
+ -e Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
+ -e Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
+ -e Verify_Setting_OCC_Turbo_Via_REST
+

tests/test_sensors.robot

diff --git a/tests/test_sensors.robot b/tests/test_sensors.robot
index 4825554..2ffc7ea 100644
--- a/tests/test_sensors.robot
+++ b/tests/test_sensors.robot
@@ -11,10 +11,9 @@
 Resource               ../lib/state_manager.robot
 Library                ../data/model.py
 
-Suite setup            Setup The Suite
+Suite Setup            Setup The Suite
 Test Setup             Open Connection And Log In
 Test Teardown          Post Test Case Execution
-Suite Teardown         Restore System Configuration
 
 *** Variables ***
 ${model}=    ${OPENBMC_MODEL}
@@ -143,8 +142,9 @@
     # The allowed value for turbo allowed:
     # True  - To enable turbo allowed.
     # False - To disable turbo allowed.
-
+    [Setup]  Turbo Setting Test Case Setup
     [Tags]  Verify_Enabling_OCC_Turbo_Setting_Via_IPMI
+    [Teardown]  Restore System Configuration
 
     ${uri}=  Get System Component  TurboAllowed
     ${sensor_num}=  Get Sensor Number  ${uri}
@@ -162,8 +162,9 @@
     # The allowed value for turbo allowed:
     # True  - To enable turbo allowed.
     # False - To disable turbo allowed.
-
+    [Setup]  Turbo Setting Test Case Setup
     [Tags]  Verify_Disabling_OCC_Turbo_Setting_Via_IPMI
+    [Teardown]  Restore System Configuration
 
     ${uri}=  Get System Component  TurboAllowed
     ${sensor_num}=  Get Sensor Number  ${uri}
@@ -183,7 +184,9 @@
     # True  - To enable turbo allowed.
     # False - To disable turbo allowed.
 
+    [Setup]  Turbo Setting Test Case Setup
     [Tags]  Verify_Setting_OCC_Turbo_Via_REST
+    [Teardown]  Restore System Configuration
 
     Set Turbo Setting Via REST  False
     ${setting}=  Read Turbo Setting Via REST
@@ -193,7 +196,6 @@
     ${setting}=  Read Turbo Setting Via REST
     Should Be Equal  ${setting}  True
 
-
 CPU Present
     [Tags]  CPU_Present
 
@@ -389,6 +391,10 @@
     Set Suite Variable      ${SYSTEM_INFO}          ${resp}
     log Dictionary          ${resp}
 
+Turbo Setting Test Case Setup
+    [Documentation]  Open Connection and turbo settings
+
+    Open Connection And Log In
     ${setting}=  Read Turbo Setting Via REST
     Set Global Variable  ${TURBO_SETTING}  ${setting}