commit bb94942913cd4b9f5d3e2ed6e4736bf06ae04b96
author George Keishing <gkeishin@in.ibm.com> Thu Feb 28 21:27:44 2019 -0600
committer George Keishing <gkeishin@in.ibm.com> Fri Mar 01 00:39:26 2019 -0600
tree 35fcc006aebd7baa9b14d025b0697b02cacfe820
parent f33140f60b1a4a43e0dd25d48252957822e68bac

Update v2.0-stable branch to work with new robot package 3.x version

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

extended/test_association.robot

diff --git a/extended/test_association.robot b/extended/test_association.robot
index e988caf..e7446bc 100755
--- a/extended/test_association.robot
+++ b/extended/test_association.robot
@@ -8,7 +8,7 @@
 Resource            ../lib/boot_utils.robot
 
 Test Setup          Test Setup Execution
-Test Teardown       Close All Connections
+Test Teardown       FFDC On Test Case Fail
 
 ***Variables***
 ${target_device_path}  /sys/devices/platform/gpio-fsi/fsi0/slave@00:00/raw
@@ -41,8 +41,9 @@
     ${elog_entry}=  Get Elog URL List
     ${resp}=  OpenBMC Get Request  ${elog_entry[0]}
     ${jsondata}=  To JSON  ${resp.content}
-    Should Contain  ${jsondata}["data"]["AdditionalData"]}  ${target_device_path}
-    Should Contain  ${jsondata}["data"]["AdditionalData"]}  0x0DEADEAD
+    List Should Contain Value
+    ...  ${jsondata["data"]["AdditionalData"]}  CALLOUT_DEVICE_PATH_TEST=${target_device_path}
+    List Should Contain Value  ${jsondata["data"]["AdditionalData"]}  DEV_ADDR=0x0DEADEAD
 
 
 Create Test Error Callout And Verify Associations
@@ -62,10 +63,10 @@
     ${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"]}  callout
-    List Should Contain Value  ${jsondata}["data"]["associations"]}  fault
+    List Should Contain Value  ${jsondata["data"]["associations"][0]}  callout
+    List Should Contain Value  ${jsondata["data"]["associations"][0]}  fault
     List Should Contain Value
-    ...  ${jsondata}["data"]["associations"]}
+    ...  ${jsondata["data"]["associations"][0]}
     ...  /xyz/openbmc_project/inventory/system/chassis/motherboard/cpu0
 
 
@@ -193,7 +194,7 @@
     ${elog_entry}=  Get URL List  ${BMC_LOGGING_ENTRY}
     ${resp}=  OpenBMC Get Request  ${elog_entry[0]}
     ${jsondata}=  To JSON  ${resp.content}
-    Should Contain  ${jsondata}["data"]["AdditionalData"]  callout
+    Should Contain  ${jsondata["data"]["associations"][0]}  callout
 
     # Set the error log field "Resolved".
     # By doing so, the callout object should get deleted automatically.