Robotframework request package upgrade changes
Current working package version
robotframework-requests 0.7.2
To Test:
pip3 install robotframework-requests -U
or
# Once this commit is merged.
pip3 install -r requirements.txt
Version latest:
robotframework-requests 0.9.3
Refer Documentation:
https://marketsquare.github.io/robotframework-requests/doc/RequestsLibrary.html
What is not changed:
- The test cases under directory tests/ is not modified and is
deprecated but you can continue using it with older package
and configuration using
git clone -b v3.0-stable https://github.com/openbmc/openbmc-test-automation
Tested:
Upstream HW_CI test list, firmware code update and few other
test suite like ipmi, certificate, dumps, ffdc and redfish
test suites.
Note: I have not tested end to end, so it is likely there could be
grey areas where it could fail but should be minor w.r.t
response data format.
Resolves: openbmc/openbmc-test-automation#2105
Change-Id: Ie03b25ff88948bcccb09e9d82f8da86e28c92697
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/redfish/systems/eventlog/test_association.robot b/redfish/systems/eventlog/test_association.robot
index 3dc8d79..093aff0 100755
--- a/redfish/systems/eventlog/test_association.robot
+++ b/redfish/systems/eventlog/test_association.robot
@@ -45,10 +45,9 @@
Create Test Error With Callout
${elog_entry}= Get Elog URL List
${resp}= OpenBMC Get Request ${elog_entry[0]}
- ${jsondata}= To JSON ${resp.content}
List Should Contain Value
- ... ${jsondata["data"]["AdditionalData"]} CALLOUT_DEVICE_PATH_TEST=${target_device_path}
- List Should Contain Value ${jsondata["data"]["AdditionalData"]} DEV_ADDR=0x0DEADEAD
+ ... ${resp.json()["data"]["AdditionalData"]} CALLOUT_DEVICE_PATH_TEST=${target_device_path}
+ List Should Contain Value ${resp.json()["data"]["AdditionalData"]} DEV_ADDR=0x0DEADEAD
Create Test Error Callout And Verify Associations
@@ -67,11 +66,10 @@
Create Test Error With Callout
${elog_entry}= Get Elog URL List
${resp}= OpenBMC Get Request ${elog_entry[0]}
- ${jsondata}= To JSON ${resp.content}
- List Should Contain Value ${jsondata["data"]["Associations"][0]} callout
- List Should Contain Value ${jsondata["data"]["Associations"][0]} fault
+ List Should Contain Value ${resp.json()["data"]["Associations"][0]} callout
+ List Should Contain Value ${resp.json()["data"]["Associations"][0]} fault
List Should Contain Value
- ... ${jsondata["data"]["Associations"][0]}
+ ... ${resp.json()["data"]["Associations"][0]}
... /xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0
@@ -200,8 +198,7 @@
Create Test Error With Callout
${elog_entry}= Get URL List ${BMC_LOGGING_ENTRY}
${resp}= OpenBMC Get Request ${elog_entry[0]}
- ${jsondata}= To JSON ${resp.content}
- Should Contain ${jsondata["data"]["Associations"][0]} callout
+ Should Contain ${resp.json()["data"]["Associations"][0]} callout
# Set the error log field "Resolved".
# By doing so, the callout object should get deleted automatically.
@@ -260,12 +257,11 @@
[Documentation] Verify test error log entries.
${elog_entry}= Get Elog URL List
${resp}= OpenBMC Get Request ${elog_entry[0]}
- ${json}= To JSON ${resp.content}
- Should Be Equal ${json["data"]["Message"]}
+ Should Be Equal ${resp.json()["data"]["Message"]}
... example.xyz.openbmc_project.Example.Elog.TestCallout
- Should Be Equal ${json["data"]["Severity"]}
+ Should Be Equal ${resp.json()["data"]["Severity"]}
... xyz.openbmc_project.Logging.Entry.Level.Error
${content}= Read Attribute ${elog_entry[0]}/callout endpoints
diff --git a/redfish/systems/eventlog/test_esel.robot b/redfish/systems/eventlog/test_esel.robot
index 4a2c85e..7381f6e 100644
--- a/redfish/systems/eventlog/test_esel.robot
+++ b/redfish/systems/eventlog/test_esel.robot
@@ -104,7 +104,6 @@
${elog_entry}= Get URL List ${BMC_LOGGING_ENTRY}
${resp}= OpenBMC Get Request ${elog_entry[0]}
Should Be Equal As Strings ${resp.status_code} ${HTTP_OK}
- ${jsondata}= To JSON ${resp.content}
# "/xyz/openbmc_project/logging/entry/1": {
# "Timestamp": 1487743771812,
# "AdditionalData": [],
@@ -112,7 +111,7 @@
# "Id": 1,
# "Severity": "xyz.openbmc_project.Logging.Entry.Level.Emergency"
# }
- Should Not Be Empty ${jsondata["data"]["AdditionalData"]}
+ Should Not Be Empty ${resp.json()["data"]["AdditionalData"]}
Test Wrong Reservation_ID