Power Management: Over_max_power to 4001 and verify
New over power limit of 4001.
Verify power settings at end of limit test.
Power setting in library is now integer value instead of string.
Change-Id: I44abbaec920dee86fed63ad0b0b8d69ba2823d88
Signed-off-by: Steven Sombar <ssombar@us.ibm.com>
diff --git a/lib/energy_scale_utils.robot b/lib/energy_scale_utils.robot
index 5a15810..d0839bd 100755
--- a/lib/energy_scale_utils.robot
+++ b/lib/energy_scale_utils.robot
@@ -106,7 +106,8 @@
# power_limit The power limit in watts.
# verify If True, read the power setting to confirm.
- ${data}= Create Dictionary data=${power_limit}
+ ${int_power_limit}= Convert To Integer ${power_limit}
+ ${data}= Create Dictionary data=${int_power_limit}
Write Attribute ${CONTROL_HOST_URI}power_cap PowerCap data=${data}
Return From Keyword If ${verify} == ${False}
${power}= Read Attribute ${CONTROL_HOST_URI}power_cap PowerCap
diff --git a/tests/test_escale_base.robot b/tests/test_escale_base.robot
index 3c5425f..a4c2d40 100755
--- a/tests/test_escale_base.robot
+++ b/tests/test_escale_base.robot
@@ -19,7 +19,7 @@
*** Variables ****
-${over_max_power} 3500
+${over_max_power} 4001
${max_power} 3050
${mid_power} 1950
${min_power} 600
@@ -109,15 +109,9 @@
Test Power Limit ${min_power} ${zero_power}
Test Power Limit ${max_power} ${over_max_power}
- # There should be one error log entry for each attempt to set
- # a power limit out of range.
- ${error_logs}= Get Error Logs
- ${num_logs}= Get Length ${error_logs}
- Run Keyword If ${num_logs} != 3 Run Keywords
- ... Print Error Logs ${error_logs}
- ... AND Fail msg=Unexpected number of error logs.
-
- Delete All Error Logs
+ ${power_limit}= Get DCMI Power Limit
+ Should Be True ${power_limit} == ${max_power}
+ ... msg=Power at ${power_limit}. Power should be at ${max_power}.
Test Power Limit
@@ -165,3 +159,6 @@
# Restore the system's initial deactivation/activation setting.
Run Keyword If '${initial_deactivation}' == '${1}'
... Deactivate DCMI Power And Verify ELSE Activate DCMI Power And Verify
+
+ # Clean up any error logs before exiting.
+ Delete All Error Logs